diff --git a/tests/e2e/helpdesk/conftest.py b/tests/e2e/helpdesk/conftest.py index 53ea5ca3..9b0d14f1 100644 --- a/tests/e2e/helpdesk/conftest.py +++ b/tests/e2e/helpdesk/conftest.py @@ -135,3 +135,46 @@ async def async_created_form(async_mpt_ops, form_data): @pytest.fixture async def async_created_published_form(async_mpt_ops, async_created_form): return await async_mpt_ops.helpdesk.forms.publish(async_created_form.id) + + +@pytest.fixture +def parameter_data(short_uuid): + return { + "name": f"E2E Helpdesk Parameter {short_uuid}", + "description": "E2E Created Helpdesk Parameter", + "scope": "Form", + "phase": "Request", + "type": "SingleLineText", + "multiple": False, + "displayOrder": None, + "constraints": { + "required": False, + "readonly": False, + "hidden": False, + }, + "options": { + "hintText": "E2E Parameter Hint Text", + "placeholderText": "E2E Parameter Placeholder Text", + }, + } + + +@pytest.fixture(scope="session") +def invalid_parameter_id(): + return "PAR-0000-0000" + + +@pytest.fixture +def created_parameter(mpt_ops, parameter_data): + with create_fixture_resource_and_delete( + mpt_ops.helpdesk.parameters, parameter_data + ) as parameter: + yield parameter + + +@pytest.fixture +async def async_created_parameter(async_mpt_ops, parameter_data): + async with async_create_fixture_resource_and_delete( + async_mpt_ops.helpdesk.parameters, parameter_data + ) as parameter: + yield parameter diff --git a/tests/e2e/helpdesk/parameter_groups/parameters/conftest.py b/tests/e2e/helpdesk/parameter_groups/parameters/conftest.py index 05b6ed60..183f6ee9 100644 --- a/tests/e2e/helpdesk/parameter_groups/parameters/conftest.py +++ b/tests/e2e/helpdesk/parameter_groups/parameters/conftest.py @@ -6,24 +6,6 @@ ) -@pytest.fixture -def parameter_data(short_uuid): - return { - "name": f"E2E Helpdesk Group Parameter {short_uuid}", - "description": "E2E Created Helpdesk Group Parameter", - "scope": "Case", - "phase": "Request", - "type": "SingleLineText", - "multiple": False, - "constraints": { - "required": False, - "readonly": False, - "hidden": False, - "visibility": "All", - }, - } - - @pytest.fixture def created_parameter_definition(mpt_ops, parameter_data): with create_fixture_resource_and_delete( @@ -54,11 +36,9 @@ def parameter_group_parameter_data(created_parameter_definition): @pytest.fixture -def created_parameter_group_parameter( - parameter_group_parameters_service, parameter_group_parameter_data -): +def created_parameter_group_parameter(parameter_group_parameters_service, created_parameter): with create_fixture_resource_and_delete( - parameter_group_parameters_service, parameter_group_parameter_data + parameter_group_parameters_service, {"id": created_parameter.id, "displayOrder": 1} ) as parameter_group_parameter: yield parameter_group_parameter @@ -83,9 +63,10 @@ def async_parameter_group_parameter_data(async_created_parameter_definition): @pytest.fixture async def async_created_parameter_group_parameter( - async_parameter_group_parameters_service, async_parameter_group_parameter_data + async_parameter_group_parameters_service, async_created_parameter ): async with async_create_fixture_resource_and_delete( - async_parameter_group_parameters_service, async_parameter_group_parameter_data + async_parameter_group_parameters_service, + {"id": async_created_parameter.id, "displayOrder": 1}, ) as parameter_group_parameter: yield parameter_group_parameter diff --git a/tests/e2e/helpdesk/parameter_groups/parameters/test_async_parameters.py b/tests/e2e/helpdesk/parameter_groups/parameters/test_async_parameters.py index a8aa1ff2..4162aba3 100644 --- a/tests/e2e/helpdesk/parameter_groups/parameters/test_async_parameters.py +++ b/tests/e2e/helpdesk/parameter_groups/parameters/test_async_parameters.py @@ -5,7 +5,7 @@ from mpt_api_client.exceptions import MPTAPIError from mpt_api_client.resources.helpdesk.parameter_group_parameters import ParameterGroupParameter -pytestmark = [pytest.mark.flaky, pytest.mark.skip(reason="Unskip after MPT-19967 fixed")] +pytestmark = [pytest.mark.flaky] async def test_get_parameter_group_parameter( diff --git a/tests/e2e/helpdesk/parameter_groups/parameters/test_sync_parameters.py b/tests/e2e/helpdesk/parameter_groups/parameters/test_sync_parameters.py index 16fee1be..480c3460 100644 --- a/tests/e2e/helpdesk/parameter_groups/parameters/test_sync_parameters.py +++ b/tests/e2e/helpdesk/parameter_groups/parameters/test_sync_parameters.py @@ -5,7 +5,7 @@ from mpt_api_client.exceptions import MPTAPIError from mpt_api_client.resources.helpdesk.parameter_group_parameters import ParameterGroupParameter -pytestmark = [pytest.mark.flaky, pytest.mark.skip(reason="Unskip after MPT-19967 fixed")] +pytestmark = [pytest.mark.flaky] def test_get_parameter_group_parameter( diff --git a/tests/e2e/helpdesk/parameter_groups/test_async_parameter_groups.py b/tests/e2e/helpdesk/parameter_groups/test_async_parameter_groups.py index 8171aa57..1619e1ab 100644 --- a/tests/e2e/helpdesk/parameter_groups/test_async_parameter_groups.py +++ b/tests/e2e/helpdesk/parameter_groups/test_async_parameter_groups.py @@ -5,7 +5,7 @@ from mpt_api_client.exceptions import MPTAPIError from mpt_api_client.resources.helpdesk.parameter_groups import ParameterGroup -pytestmark = [pytest.mark.flaky, pytest.mark.skip(reason="Unskip after MPT-19967 fixed")] +pytestmark = [pytest.mark.flaky] async def test_get_parameter_group(async_parameter_groups_service, async_created_parameter_group): diff --git a/tests/e2e/helpdesk/parameter_groups/test_sync_parameter_groups.py b/tests/e2e/helpdesk/parameter_groups/test_sync_parameter_groups.py index 71935eaf..3726adb3 100644 --- a/tests/e2e/helpdesk/parameter_groups/test_sync_parameter_groups.py +++ b/tests/e2e/helpdesk/parameter_groups/test_sync_parameter_groups.py @@ -5,7 +5,7 @@ from mpt_api_client.exceptions import MPTAPIError from mpt_api_client.resources.helpdesk.parameter_groups import ParameterGroup -pytestmark = [pytest.mark.flaky, pytest.mark.skip(reason="Unskip after MPT-19967 fixed")] +pytestmark = [pytest.mark.flaky] def test_get_parameter_group(parameter_groups_service, created_parameter_group): diff --git a/tests/e2e/helpdesk/parameters/conftest.py b/tests/e2e/helpdesk/parameters/conftest.py deleted file mode 100644 index ace46f00..00000000 --- a/tests/e2e/helpdesk/parameters/conftest.py +++ /dev/null @@ -1,45 +0,0 @@ -import pytest - -from tests.e2e.helper import ( - async_create_fixture_resource_and_delete, - create_fixture_resource_and_delete, -) - - -@pytest.fixture -def parameter_data(short_uuid): - return { - "name": f"E2E Helpdesk Parameter {short_uuid}", - "description": "E2E Created Helpdesk Parameter", - "scope": "Case", - "phase": "Request", - "type": "SingleLineText", - "multiple": False, - "constraints": { - "required": False, - "readonly": False, - "hidden": False, - "visibility": "All", - }, - } - - -@pytest.fixture(scope="session") -def invalid_parameter_id(): - return "PAR-0000-0000" - - -@pytest.fixture -def created_parameter(mpt_ops, parameter_data): - with create_fixture_resource_and_delete( - mpt_ops.helpdesk.parameters, parameter_data - ) as parameter: - yield parameter - - -@pytest.fixture -async def async_created_parameter(async_mpt_ops, parameter_data): - async with async_create_fixture_resource_and_delete( - async_mpt_ops.helpdesk.parameters, parameter_data - ) as parameter: - yield parameter diff --git a/tests/e2e/helpdesk/parameters/test_async_parameters.py b/tests/e2e/helpdesk/parameters/test_async_parameters.py index 45e680c0..e22ecde6 100644 --- a/tests/e2e/helpdesk/parameters/test_async_parameters.py +++ b/tests/e2e/helpdesk/parameters/test_async_parameters.py @@ -5,7 +5,7 @@ from mpt_api_client.exceptions import MPTAPIError from mpt_api_client.resources.helpdesk.parameters import Parameter -pytestmark = [pytest.mark.flaky, pytest.mark.skip(reason="Unskip after MPT-19967 fixed")] +pytestmark = [pytest.mark.flaky] async def test_get_parameter(async_mpt_ops, async_created_parameter): diff --git a/tests/e2e/helpdesk/parameters/test_sync_parameters.py b/tests/e2e/helpdesk/parameters/test_sync_parameters.py index a8ef1f45..9fc2282f 100644 --- a/tests/e2e/helpdesk/parameters/test_sync_parameters.py +++ b/tests/e2e/helpdesk/parameters/test_sync_parameters.py @@ -5,7 +5,7 @@ from mpt_api_client.exceptions import MPTAPIError from mpt_api_client.resources.helpdesk.parameters import Parameter -pytestmark = [pytest.mark.flaky, pytest.mark.skip(reason="Unskip after MPT-19967 fixed")] +pytestmark = [pytest.mark.flaky] def test_get_parameter(mpt_ops, created_parameter):