Commit 74c477895fcc5c939eec61e21a71f6dbfd5d5026

Authored by Playtenders
1 parent 0b7e6b85

fix

... ... @@ -858,7 +858,7 @@ Resource playtender_agree
858 858 ... в статус active.
859 859
860 860 open tender page by uaid ${tender_uaid}
861   - Run Keyword If "${TEST_NAME}" == "Неможливість підтвердити постачальника після закінчення періоду кваліфікації" and '${mode}' == 'open_framework' GetTenderContract ${username} ${tender_uaid}
  861 + Run Keyword If "${TEST_NAME}" == "Неможливість підтвердити постачальника після закінчення періоду кваліфікації" and '${mode}' == 'open_framework' GetTenderContract ${tender_uaid}
862 862 open tender form qualification ${award_num}
863 863 confirm award qualification ${username} ${award_num}
864 864
... ... @@ -1288,29 +1288,29 @@ Resource playtender_agree
1288 1288 ... ELSE Run Keyword If '${field_name}' == 'changes[0].rationaleType' get value by locator on opened page ${agreement_changes_0_rationaleType_value_locator}
1289 1289 ... ELSE Run Keyword If '${field_name}' == 'changes[0].rationale' get value by locator on opened page ${agreement_changes_0_rationale_value_locator}
1290 1290 ... ELSE Run Keyword If '${field_name}' == 'changes[0].modifications[0].itemId' get value by locator on opened page ${agreement_changes_0_modifications_0_itemId_value_locator}
1291   - ... ELSE Run Keyword If '${field_name}' == 'changes[0].modifications[0].factor' get value by locator on opened page ${agreement_changes_0_modifications_0_factor_value_locator}
  1291 + ... ELSE Run Keyword If '${field_name}' == 'changes[0].modifications[0].factor' get value by locator on opened page ${agreement_changes_0_modifications_0_factor_value_locator} ${agreement_changes_0_modifications_0_factor_value_type}
1292 1292 ... ELSE Run Keyword If '${field_name}' == 'changes[0].modifications[0].addend' get value by locator on opened page ${agreement_changes_0_modifications_0_addend_value_locator}
1293 1293 ... ELSE Run Keyword If '${field_name}' == 'changes[1].rationaleType' get value by locator on opened page ${agreement_changes_1_rationaleType_value_locator}
1294 1294 ... ELSE Run Keyword If '${field_name}' == 'changes[1].rationale' get value by locator on opened page ${agreement_changes_1_rationale_value_locator}
1295 1295 ... ELSE Run Keyword If '${field_name}' == 'changes[1].modifications[0].itemId' get value by locator on opened page ${agreement_changes_1_modifications_0_itemId_value_locator}
1296   - ... ELSE Run Keyword If '${field_name}' == 'changes[1].modifications[0].factor' get value by locator on opened page ${agreement_changes_1_modifications_0_factor_value_locator}
  1296 + ... ELSE Run Keyword If '${field_name}' == 'changes[1].modifications[0].factor' get value by locator on opened page ${agreement_changes_1_modifications_0_factor_value_locator} ${agreement_changes_1_modifications_0_factor_value_type}
1297 1297 ... ELSE Run Keyword If '${field_name}' == 'changes[1].status' get value by locator on opened page ${agreement_changes_1_status_value_locator}
1298 1298 ... ELSE Run Keyword If '${field_name}' == 'changes[2].rationaleType' get value by locator on opened page ${agreement_changes_2_rationaleType_value_locator}
1299 1299 ... ELSE Run Keyword If '${field_name}' == 'changes[2].rationale' get value by locator on opened page ${agreement_changes_2_rationale_value_locator}
1300 1300 ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].itemId' get value by locator on opened page ${agreement_changes_2_modifications_0_itemId_value_locator}
1301   - ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].factor' get value by locator on opened page ${agreement_changes_2_modifications_0_factor_value_locator}
  1301 + ... ELSE Run Keyword If '${field_name}' == 'changes[2].modifications[0].factor' get value by locator on opened page ${agreement_changes_2_modifications_0_factor_value_locator} ${agreement_changes_2_modifications_0_factor_value_type}
1302 1302 ... ELSE Run Keyword If '${field_name}' == 'changes[2].status' get value by locator on opened page ${agreement_changes_2_status_value_locator}
1303 1303 ... ELSE Run Keyword If '${field_name}' == 'changes[3].rationaleType' get value by locator on opened page ${agreement_changes_3_rationaleType_value_locator}
1304 1304 ... ELSE Run Keyword If '${field_name}' == 'changes[3].rationale' get value by locator on opened page ${agreement_changes_3_rationale_value_locator}
1305 1305 ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].itemId' get value by locator on opened page ${agreement_changes_3_modifications_0_itemId_value_locator}
1306   - ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].factor' get value by locator on opened page ${agreement_changes_2_modifications_0_factor_value_locator}
  1306 + ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].factor' get value by locator on opened page ${agreement_changes_3_modifications_0_factor_value_locator} ${agreement_changes_3_modifications_0_factor_value_type}
1307 1307 ... ELSE Run Keyword If '${field_name}' == 'changes[3].modifications[0].contractId' get value by locator on opened page ${}
1308 1308 ... ELSE Run Keyword If '${field_name}' == 'changes[3].status' get value by locator on opened page ${agreement_changes_3_status_value_locator}
1309 1309 Run Keyword If 'rationaleType' in '${field_name}' Run Keywords
1310   - ... run keyword if '${return_value}' == 'Зміна ціни за одиницю товару' ${return_value} = set variable itemPriceVariation
1311   - ... AND run keyword if '${return_value}' == 'Зміна ціни у зв’язку із зміною ставок податків і зборів' ${return_value} = set variable taxRate
1312   - ... AND run keyword if '${return_value}' == 'Зміна сторонніх показників (курсу, тарифів...)' ${return_value} = set variable thirdParty
1313   - ... AND run keyword if '${return_value}' == 'Припинення участі у рамковій угоді учасника' ${return_value} = set variable partyWithdrawal
  1310 + ... run keyword if "${return_value}" == "Зміна ціни за одиницю товару" ${return_value} = set variable itemPriceVariation
  1311 + ... AND run keyword if "${return_value}" == "Зміна ціни у зв’язку із зміною ставок податків і зборів" ${return_value} = set variable taxRate
  1312 + ... AND run keyword if "${return_value}" == "Зміна сторонніх показників (курсу, тарифів...)" ${return_value} = set variable thirdParty
  1313 + ... AND run keyword if "${return_value}" == "Припинення участі у рамковій угоді учасника" ${return_value} = set variable partyWithdrawal
1314 1314 [Return] ${return_value}
1315 1315
1316 1316 ########################################################################################################################
... ...
... ... @@ -19,7 +19,7 @@ ${agreement_changes_0_rationale_value_locator} = jquery=.tabs
19 19 ${agreement_changes_0_modifications_0_itemId_value_locator} = jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-itemId.hidden
20 20 ${agreement_changes_0_modifications_0_factor_value_locator} = jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
21 21 ${agreement_changes_0_modifications_0_factor_value_type} = float
22   -${agreement_changes_0_modifications_0_addend_value_locator} = jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-factor.hidden
  22 +${agreement_changes_0_modifications_0_addend_value_locator} = jquery=.tabs__pane.tabs__pane--visible[id*="tab-agreement-change"]:nth(0) .agreement-contract-info-wrapper.info-wrapper .info-row.modification0-addend.hidden
23 23
24 24 ${agreement_changes_1_rationaleType_value_locator} = jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.rationale-type span.value
25 25 ${agreement_changes_1_rationale_value_locator} = jquery=.tabs__pane[id*="tab-agreement-change"]:nth(1) .agreement-contract-info-wrapper.info-wrapper .info-row.rationale span.value
... ...
... ... @@ -760,8 +760,8 @@ decline tender
760 760 [return] ${tender}
761 761
762 762
763   -GetTenderContract ${username} ${tender_uaid}
764   - [Arguments] ${username} ${tender_uaid}
  763 +GetTenderContract
  764 + [Arguments] ${tender_uaid}
765 765 [Documentation]
766 766 ... Username, tender uaid
767 767
... ...
Please register or login to post a comment