Merge pull request #272

MPT-19489 refactor fixtures to replace chat_id with created_chat

Author: jentyk

e2e_config.test.json

@@ -56,8 +56,6 @@
   "commerce.product.listing.id": "LST-5489-0806",
   "commerce.product.template.id": "TPL-1767-7355-0002",
   "commerce.user.id": "USR-4303-2348",
-  "helpdesk.chat.id": "CHT-5064-0262-3671",
-  "helpdesk.channel.id": "CHL-5064-0262-3671",
   "commerce.subscription.agreement.id": "AGR-2473-3299-1721",
   "commerce.subscription.id": "SUB-3678-1831-2188",
   "commerce.subscription.product.item.id": "ITM-1767-7355-0001",

tests/e2e/helpdesk/cases/test_async_cases.py

@@ -11,7 +11,7 @@
 async def test_get_case(async_mpt_ops, async_created_case):
     result = await async_mpt_ops.helpdesk.cases.get(async_created_case.id)
 
-    assert result.id == async_created_case.id
+    assert isinstance(result, Case)
 
 
 async def test_list_cases(async_mpt_ops):
@@ -26,7 +26,7 @@ async def test_list_cases(async_mpt_ops):
 def test_create_case(async_created_case):
     result = async_created_case
 
-    assert result is not None
+    assert isinstance(result, Case)
 
 
 async def test_update_case(async_mpt_ops, async_created_case, short_uuid):
@@ -35,7 +35,7 @@ async def test_update_case(async_mpt_ops, async_created_case, short_uuid):
 
     result = await async_mpt_ops.helpdesk.cases.update(async_created_case.id, update_data)
 
-    assert result.id == async_created_case.id
+    assert isinstance(result, Case)
     assert result.to_dict().get("awaiting") is True
 
 

tests/e2e/helpdesk/cases/test_sync_cases.py

@@ -11,7 +11,7 @@
 def test_get_case(mpt_ops, created_case):
     result = mpt_ops.helpdesk.cases.get(created_case.id)
 
-    assert result.id == created_case.id
+    assert isinstance(result, Case)
 
 
 def test_list_cases(mpt_ops):
@@ -26,7 +26,7 @@ def test_list_cases(mpt_ops):
 def test_create_case(created_case):
     result = created_case
 
-    assert result is not None
+    assert isinstance(result, Case)
 
 
 def test_update_case(mpt_ops, created_case, short_uuid):
@@ -35,7 +35,7 @@ def test_update_case(mpt_ops, created_case, short_uuid):
 
     result = mpt_ops.helpdesk.cases.update(created_case.id, update_data)
 
-    assert result.id == created_case.id
+    assert isinstance(result, Case)
     assert result.to_dict().get("awaiting") is True
 
 

tests/e2e/helpdesk/channels/conftest.py

@@ -6,11 +6,6 @@
 )
 
 
-@pytest.fixture(scope="session")
-def channel_id(e2e_config):
-    return e2e_config["helpdesk.channel.id"]  # FIXME: seed data
-
-
 @pytest.fixture(scope="session")
 def invalid_channel_id():
     return "CHN-0000-0000-0000"

tests/e2e/helpdesk/channels/test_async_channels.py

@@ -13,7 +13,7 @@ async def test_get_channel(async_mpt_ops, channel_id):
 
     result = await service.get(channel_id)
 
-    assert result.id == channel_id
+    assert isinstance(result, Channel)
 
 
 async def test_list_channels(async_mpt_ops):
@@ -28,7 +28,7 @@ async def test_list_channels(async_mpt_ops):
 def test_create_channel(async_created_channel):
     result = async_created_channel
 
-    assert result.id is not None
+    assert isinstance(result, Channel)
 
 
 async def test_update_channel(async_mpt_ops, async_created_channel, short_uuid):
@@ -37,7 +37,7 @@ async def test_update_channel(async_mpt_ops, async_created_channel, short_uuid):
 
     result = await service.update(async_created_channel.id, {"name": new_name})
 
-    assert result.id == async_created_channel.id
+    assert isinstance(result, Channel)
     assert result.to_dict().get("name") == new_name
 
 

tests/e2e/helpdesk/channels/test_sync_channels.py

@@ -13,7 +13,7 @@ def test_get_channel(mpt_ops, channel_id):
 
     result = service.get(channel_id)
 
-    assert result.id == channel_id
+    assert isinstance(result, Channel)
 
 
 def test_list_channels(mpt_ops):
@@ -28,7 +28,7 @@ def test_list_channels(mpt_ops):
 def test_create_channel(created_channel):
     result = created_channel
 
-    assert result.id is not None
+    assert isinstance(result, Channel)
 
 
 def test_update_channel(mpt_ops, created_channel, short_uuid):
@@ -37,7 +37,7 @@ def test_update_channel(mpt_ops, created_channel, short_uuid):
 
     result = service.update(created_channel.id, {"name": new_name})
 
-    assert result.id == created_channel.id
+    assert isinstance(result, Channel)
     assert result.to_dict().get("name") == new_name
 
 

tests/e2e/helpdesk/chats/answers/parameters/test_async_parameters.py

@@ -22,7 +22,7 @@ async def test_iterate_chat_answer_parameters(async_chat_answer_parameters_servi
     iterator = async_chat_answer_parameters_service.iterate(limit=20)
     result = await anext(iterator, None)
 
-    assert result is None or result.id is not None
+    assert isinstance(result, ChatAnswerParameter)
 
 
 async def test_not_found(async_mpt_ops, chat_id):

tests/e2e/helpdesk/chats/answers/parameters/test_sync_parameters.py

@@ -23,7 +23,7 @@ def test_iterate_chat_answer_parameters(chat_answer_parameters_service):
 
     result = next(iterator, None)
 
-    assert result is None or result.id is not None
+    assert isinstance(result, ChatAnswerParameter)
 
 
 def test_not_found(mpt_ops, chat_id):

tests/e2e/helpdesk/chats/answers/test_async_answers.py

@@ -14,7 +14,7 @@
 async def test_get_chat_answer(async_chat_answers_service, async_created_chat_answer):
     result = await async_chat_answers_service.get(async_created_chat_answer.id)
 
-    assert result.id == async_created_chat_answer.id
+    assert isinstance(result, ChatAnswer)
 
 
 async def test_list_chat_answers(async_chat_answers_service):
@@ -27,7 +27,7 @@ async def test_list_chat_answers(async_chat_answers_service):
 def test_create_chat_answer(async_created_chat_answer):
     result = async_created_chat_answer
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 async def test_update_chat_answer(
@@ -37,22 +37,22 @@ async def test_update_chat_answer(
 
     result = await async_chat_answers_service.update(async_created_chat_answer.id, update_data)
 
-    assert result.id == async_created_chat_answer.id
+    assert isinstance(result, ChatAnswer)
     assert result.to_dict().get("name") == update_data["name"]
 
 
 async def test_submit_chat_answer(async_chat_answers_service, async_created_chat_answer):
     result = await async_chat_answers_service.submit(async_created_chat_answer.id)
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 async def test_query_chat_answer(async_chat_answers_service, async_created_chat_answer):
     submitted_chat_answer = await async_chat_answers_service.submit(async_created_chat_answer.id)
 
     result = await async_chat_answers_service.query(submitted_chat_answer.id)
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 async def test_validate_chat_answer(async_chat_answers_service, async_created_chat_answer):
@@ -61,13 +61,13 @@ async def test_validate_chat_answer(async_chat_answers_service, async_created_ch
         {"parameters": []},
     )
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 async def test_accept_chat_answer(async_chat_answers_service, async_created_chat_answer):
     result = await async_chat_answers_service.accept(async_created_chat_answer.id)
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 async def test_delete_chat_answer(async_chat_answers_service, async_created_chat_answer):

tests/e2e/helpdesk/chats/answers/test_sync_answers.py

@@ -27,42 +27,42 @@ def test_list_chat_answers(chat_answers_service):
 def test_create_chat_answer(created_chat_answer):
     result = created_chat_answer
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 def test_update_chat_answer(chat_answers_service, created_chat_answer, short_uuid):
     update_data = {"name": f"e2e updated answer {short_uuid}"}
 
     result = chat_answers_service.update(created_chat_answer.id, update_data)
 
-    assert result.id == created_chat_answer.id
+    assert isinstance(result, ChatAnswer)
     assert result.to_dict().get("name") == update_data["name"]
 
 
 def test_submit_chat_answer(chat_answers_service, created_chat_answer):
     result = chat_answers_service.submit(created_chat_answer.id)
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 def test_query_chat_answer(chat_answers_service, created_chat_answer):
     submitted_chat_answer = chat_answers_service.submit(created_chat_answer.id)
 
     result = chat_answers_service.query(submitted_chat_answer.id)
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 def test_validate_chat_answer(chat_answers_service, created_chat_answer):
     result = chat_answers_service.validate(created_chat_answer.id, {"parameters": []})
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 def test_accept_chat_answer(chat_answers_service, created_chat_answer):
     result = chat_answers_service.accept(created_chat_answer.id)
 
-    assert result is not None
+    assert isinstance(result, ChatAnswer)
 
 
 def test_delete_chat_answer(chat_answers_service, created_chat_answer):