Commit f3f7193813434ddefbc749043ca1ad7787696317
1 parent
044ac654
Update `Скасувати вимогу` to work with complaintID
Delete test_cancel_claim_data Dict with data is created in test case, id is inserted into it in op_client.robot keyword 'Скасувати вимогу' Update singleItemTenderComplaints to work with this changes
Showing
4 changed files
with
20 additions
and
25 deletions
... | ... | @@ -420,9 +420,11 @@ Library openprocurement_client_helper.py |
420 | 420 | |
421 | 421 | Скасувати вимогу |
422 | 422 | [Documentation] Переводить вимогу в статус "canceled" |
423 | - [Arguments] ${username} ${tender_uaid} ${claim} ${cancellation_data} | |
423 | + [Arguments] ${username} ${tender_uaid} ${complaintID} ${cancellation_data} | |
424 | 424 | ${tender}= openprocurement_client.Пошук тендера по ідентифікатору ${username} ${tender_uaid} |
425 | - ${tender}= set_access_key ${tender} ${claim.access.token} | |
425 | + ${tender}= set_access_key ${tender} ${USERS.users['${username}'].complaint_access_token} | |
426 | + ${complaint_internal_id}= Отримати internal id по UAid для скарги ${tender} ${complaintID} | |
427 | + Set To Dictionary ${cancellation_data.data} id=${complaint_internal_id} | |
426 | 428 | ${reply}= Call Method ${USERS.users['${username}'].client} patch_complaint ${tender} ${cancellation_data} |
427 | 429 | Log ${reply} |
428 | 430 | ... | ... |
... | ... | @@ -254,16 +254,6 @@ def test_cancel_tender_data(cancellation_reason): |
254 | 254 | }) |
255 | 255 | |
256 | 256 | |
257 | -def test_cancel_claim_data(claim_id, cancellation_reason): | |
258 | - return munchify({ | |
259 | - 'data': { | |
260 | - 'cancellationReason': cancellation_reason, | |
261 | - 'status': 'cancelled', | |
262 | - 'id': claim_id | |
263 | - } | |
264 | - }) | |
265 | - | |
266 | - | |
267 | 257 | def test_confirm_data(id): |
268 | 258 | return munchify({ |
269 | 259 | "data": { | ... | ... |
... | ... | @@ -365,12 +365,13 @@ ${mode} single |
365 | 365 | Set suite variable ${CLAIM_NUM} |
366 | 366 | |
367 | 367 | |
368 | - ${cancellation_reason}= Set variable prosto tak :) | |
369 | - ${cancellation_data}= test_cancel_claim_data ${USERS.users['${provider}']['claim_data2']['claim_resp']['data']['id']} ${cancellation_reason} | |
368 | + ${cancellation_reason}= create_fake_sentence | |
369 | + ${data}= Create Dictionary status=cancelled cancellationReason=${cancellation_reason} | |
370 | + ${cancellation_data}= Create Dictionary data=${data} | |
370 | 371 | Викликати для учасника ${provider} |
371 | 372 | ... Скасувати вимогу |
372 | 373 | ... ${TENDER['TENDER_UAID']} |
373 | - ... ${USERS.users['${provider}']['claim_data2']['claim_resp']} | |
374 | + ... ${USERS.users['${provider}']['claim_data2']['complaintID']} | |
374 | 375 | ... ${cancellation_data} |
375 | 376 | Set To Dictionary ${USERS.users['${provider}'].claim_data2} cancellation ${cancellation_data} |
376 | 377 | |
... | ... | @@ -452,12 +453,13 @@ ${mode} single |
452 | 453 | ... ${confirmation_data} |
453 | 454 | |
454 | 455 | |
455 | - ${cancellation_reason}= Set variable prosto tak :) | |
456 | - ${cancellation_data}= test_cancel_claim_data ${USERS.users['${provider}']['claim_data3']['claim_resp']['data']['id']} ${cancellation_reason} | |
456 | + ${cancellation_reason}= create_fake_sentence | |
457 | + ${data}= Create Dictionary status=cancelled cancellationReason=${cancellation_reason} | |
458 | + ${cancellation_data}= Create Dictionary data=${data} | |
457 | 459 | Викликати для учасника ${provider} |
458 | 460 | ... Скасувати вимогу |
459 | 461 | ... ${TENDER['TENDER_UAID']} |
460 | - ... ${USERS.users['${provider}']['claim_data3']['claim_resp']} | |
462 | + ... ${USERS.users['${provider}']['claim_data3']['complaintID']} | |
461 | 463 | ... ${cancellation_data} |
462 | 464 | Set To Dictionary ${USERS.users['${provider}'].claim_data3} cancellation ${cancellation_data} |
463 | 465 | |
... | ... | @@ -528,12 +530,13 @@ ${mode} single |
528 | 530 | ... ${answer_data} |
529 | 531 | |
530 | 532 | |
531 | - ${cancellation_reason}= Set variable prosto tak :) | |
532 | - ${cancellation_data}= test_cancel_claim_data ${USERS.users['${provider}']['claim_data4']['claim_resp']['data']['id']} ${cancellation_reason} | |
533 | + ${cancellation_reason}= create_fake_sentence | |
534 | + ${data}= Create Dictionary status=cancelled cancellationReason=${cancellation_reason} | |
535 | + ${cancellation_data}= Create Dictionary data=${data} | |
533 | 536 | Викликати для учасника ${provider} |
534 | 537 | ... Скасувати вимогу |
535 | 538 | ... ${TENDER['TENDER_UAID']} |
536 | - ... ${USERS.users['${provider}']['claim_data4']['claim_resp']} | |
539 | + ... ${USERS.users['${provider}']['claim_data4']['complaintID']} | |
537 | 540 | ... ${cancellation_data} |
538 | 541 | Set To Dictionary ${USERS.users['${provider}'].claim_data4} cancellation ${cancellation_data} |
539 | 542 | |
... | ... | @@ -673,12 +676,13 @@ ${mode} single |
673 | 676 | ... ${USERS.users['${provider}'].broker} |
674 | 677 | ... from-0.12 |
675 | 678 | [Teardown] Оновити LAST_MODIFICATION_DATE |
676 | - ${cancellation_reason}= Set variable prosto tak :) | |
677 | - ${cancellation_data}= test_cancel_claim_data ${USERS.users['${provider}']['claim_data5']['claim_resp']['data']['id']} ${cancellation_reason} | |
679 | + ${cancellation_reason}= create_fake_sentence | |
680 | + ${data}= Create Dictionary status=cancelled cancellationReason=${cancellation_reason} | |
681 | + ${cancellation_data}= Create Dictionary data=${data} | |
678 | 682 | Викликати для учасника ${provider} |
679 | 683 | ... Скасувати вимогу |
680 | 684 | ... ${TENDER['TENDER_UAID']} |
681 | - ... ${USERS.users['${provider}']['claim_data5']['claim_resp']} | |
685 | + ... ${USERS.users['${provider}']['claim_data5']['complaintID']} | |
682 | 686 | ... ${cancellation_data} |
683 | 687 | Set To Dictionary ${USERS.users['${provider}'].claim_data5} cancellation ${cancellation_data} |
684 | 688 | ... | ... |
Please
register
or
login
to post a comment