Make test_confirm_data

Update other functions to work with Munch Delete test_change_cancellation_document_field_data

Make test_confirm_data
Update other functions to work with Munch Delete test_change_cancellation_document_field_data
mykhaly
1 parent c7c00a2a
Showing 3 changed files with 44 additions and 51 deletions
op_robot_tests/tests_files/brokers/openprocurement_client.robot
op_robot_tests/tests_files/initial_data.py
op_robot_tests/tests_files/service_keywords.py
--- a/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @561c4d6
+++ b/op_robot_tests/tests_files/brokers/openprocurement_client.robot
View file @561c4d6
@@ -397,7 +397,7 @@ Library  openprocurement_client_helper.py
   ...      [Return] Nothing
   [Arguments]  ${username}  ${tender_uaid}  ${award_num}
   ${tender}=  Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  ${data}=  test_confirm_supplier_data  ${tender['data']['awards'][${award_num}]['id']}
+  ${data}=  test_confirm_data  ${tender['data']['awards'][${award_num}]['id']}
   Log  ${data}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_award  ${tender}  ${data}
   Log  ${reply}
@@ -439,7 +439,8 @@ Library  openprocurement_client_helper.py
   ...      [Return] Nothing
   [Arguments]  ${username}  ${tender_uaid}  ${cancel_num}  ${doc_num}  ${field}  ${value}
   ${tender}=  Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  ${data}=  test_change_cancellation_document_field_data  ${field}  ${value}
+  ${temp}=  Create Dictionary  ${field}  ${value}
+  ${data}=  Create Dictionary  data  ${temp}
   Log  ${data}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_cancellation_document  ${tender}  ${data}  ${tender['data']['cancellations'][${cancel_num}]['id']}  ${tender['data']['cancellations'][${cancel_num}]['documents'][${doc_num}]['id']}
   Log  ${reply}
@@ -466,7 +467,7 @@ Library  openprocurement_client_helper.py
   ...      [Return] Nothing
   [Arguments]  ${username}  ${tender_uaid}  ${cancel_num}
   ${tender}=  Пошук тендера по ідентифікатору  ${username}  ${tender_uaid}
-  ${data}=  test_confirm_cancellation_data  ${tender['data']['cancellations'][${cancel_num}]['id']}
+  ${data}=  test_confirm_data  ${tender['data']['cancellations'][${cancel_num}]['id']}
   Log  ${data}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_cancellation  ${tender}  ${data}
   Log  ${reply}
@@ -479,7 +480,7 @@ Library  openprocurement_client_helper.py
   ...      [Return] Nothing
   [Arguments]  ${username}  ${tender_uaid}  ${contract_num}
   ${tender}=  Викликати для учасника  ${username}  Пошук тендера по ідентифікатору  ${tender_uaid}
-  ${data}=  test_confirm_contract_data  ${tender['data']['contracts'][${contract_num}]['id']}
+  ${data}=  test_confirm_data  ${tender['data']['contracts'][${contract_num}]['id']}
   Log  ${data}
   ${reply}=  Call Method  ${USERS.users['${username}'].client}  patch_contract  ${tender}  ${data}
   Log  ${reply}
--- a/op_robot_tests/tests_files/initial_data.py
View file @561c4d6
+++ b/op_robot_tests/tests_files/initial_data.py
View file @561c4d6
@@ -535,28 +535,28 @@ def test_claim_data():
 def test_complaint_answer_data(complaint_id):
-    return {
+    return munchify({
         "data": {
             "id": complaint_id,
             "status": "answered",
             "resolutionType": "resolved",
             "resolution": fake.sentence(nb_words=40, variable_nb_words=True)
         }
-    }
+    })
 def test_claim_answer_satisfying_data(claim_id):
-    return {
+    return munchify({
         "data": {
             "id": claim_id,
             "status": "resolved",
             "satisfied": True
         }
-    }
+    })
 def test_claim_answer_data(claim_id):
-    return {
+    return munchify({
         "data": {
             "status": "answered",
             "resolutionType": "resolved",
@@ -564,86 +564,80 @@ def test_claim_answer_data(claim_id):
             "resolution": fake.sentence(nb_words=15, variable_nb_words=True),
             "id": claim_id
         }
-    }
+    })
+
 def test_escalate_claim_data(claim_id):
-    return {
+    return munchify({
         "data": {
             "status": "pending",
             "satisfied": False,
             "id": claim_id
         }
-    }
+    })
 def test_cancel_tender_data(cancellation_reason):
-    return {
+    return munchify({
         'data': {
             'reason': cancellation_reason
         }
-    }
+    })
 def test_cancel_claim_data(claim_id, cancellation_reason):
-    return {
+    return munchify({
         'data': {
             'cancellationReason': cancellation_reason,
             'status': 'cancelled',
             'id': claim_id
         }
-    }
+    })
 def test_change_cancellation_document_field_data(key, value):
-    data = {
+    return munchify({
         "data": {
             key: value
         }
-    }
-    return data
-
+    })
-def test_confirm_supplier_data(supplier_id):
-    return {
-        "data": {
-            "status": "active",
-            "id": supplier_id
-        }
-    }
-def test_confirm_cancellation_data(cancellation_id):
-    data = {
+def test_confirm_data(ID):
+    return munchify({
         "data": {
             "status": "active",
-            "id": cancellation_id
+            "id": ID
         }
-    }
-    return data
-
-
-def test_confirm_contract_data(contract_id):
-    data = {
-        "data": {
-            "id": contract_id,
-            "status": "active"
-        }
-    }
-    return data
+    })
 def test_submit_claim_data(claim_id):
-    return {
+    return munchify({
         "data": {
             "id": claim_id,
             "status": "claim"
         }
-    }
+    })
 def test_additional_items_data(tender_id, access_token):
-    data = {"access": {"token": access_token}, "data": {"id": tender_id, "items": [{"unit": {"code": "MON", "name": "month"}, "quantity": 9}]}}
-    return data
+    return munchify({
+        "access": {
+            "token": access_token
+            },
+        "data": {
+            "id": tender_id,
+             "items": [{
+                "unit": {
+                    "code": "MON",
+                    "name": "month"
+                    },
+                "quantity": 9
+            }]
+        }
+    })
 def test_complaint_reply_data():
@@ -786,7 +780,7 @@ def auction_bid():
 def test_supplier_data():
-    return {
+    return munchify({
         "data": {
             "suppliers": [
                 {
@@ -817,7 +811,7 @@ def test_supplier_data():
                 "valueAddedTaxIncluded": True
             }
         }
-    }
+    })
 def test_award_data():
--- a/op_robot_tests/tests_files/service_keywords.py
View file @561c4d6
+++ b/op_robot_tests/tests_files/service_keywords.py
View file @561c4d6
@@ -25,9 +25,7 @@ from .initial_data import (
     test_change_cancellation_document_field_data,
     test_claim_answer_data,
     test_claim_data,
-    test_confirm_cancellation_data,
-    test_confirm_contract_data,
-    test_confirm_supplier_data,
+    test_confirm_data,
     test_claim_answer_satisfying_data,
     test_complaint_answer_data,
     test_complaint_data,