Alex / prozorro-robot_tests · Commits

Commit 907b22aa01f11948c24d9e2b5611384ec9aee294

Authored by biviktorqc
2 parents f451e93a 9f9fd974

Merge branch 'pc2' into pc2r 

Conflicts:
	op_robot_tests/tests_files/brokers/etender.robot
	op_robot_tests/tests_files/brokers/netcast.robot
	op_robot_tests/tests_files/brokers/newtend.robot
	op_robot_tests/tests_files/brokers/openprocurement_client.robot
	op_robot_tests/tests_files/brokers/publicbid.robot
	op_robot_tests/tests_files/data/users.yaml
	op_robot_tests/tests_files/service_keywords.py
	op_robot_tests/tests_files/singleItemTender.robot
Inline Side-by-side
Showing 9 changed files with 102 additions and 125 deletions
... ... @@ -5,6 +5,8 @@ Library DateTime
5 5
6 6 *** Variables ***
7 7 ${locator.tenderId} jquery=h3
  8 +##Використовую такий шлях у кожного буде мінятись /yboi/. Міняйте на сві шлях до файлу
  9 +${file_path} /home/yboi/openprocurement.robottests.buildout/Document.docx
8 10
9 11 *** Keywords ***
10 12 Підготувати клієнт для користувача
... ... @@ -25,30 +27,30 @@ ${locator.tenderId} jquery=h3
25 27 [Arguments] @{ARGUMENTS}
26 28 [Documentation]
27 29 ... ${ARGUMENTS[0]} == username
28   - ... ${ARGUMENTS[1]} == tender_data
29   - ${tender_data}= Add_time_for_GUI_FrontEnds ${ARGUMENTS[1]}
30   - ${items}= Get From Dictionary ${tender_data.data} items
31   - ${title}= Get From Dictionary ${tender_data.data} title
32   - ${description}= Get From Dictionary ${tender_data.data} description
33   - ${budget}= Get From Dictionary ${tender_data.data.value} amount
34   - ${step_rate}= Get From Dictionary ${tender_data.data.minimalStep} amount
35   - ${items_description}= Get From Dictionary ${tender_data.data} description
  30 + ... ${ARGUMENTS[1]} == initial_tender_data
  31 + ${prepared_tender_data}= Add_data_for_GUI_FrontEnds ${ARGUMENTS[1]}
  32 + ${items}= Get From Dictionary ${prepared_tender_data.data} items
  33 + ${title}= Get From Dictionary ${prepared_tender_data.data} title
  34 + ${description}= Get From Dictionary ${prepared_tender_data.data} description
  35 + ${budget}= Get From Dictionary ${prepared_tender_data.data.value} amount
  36 + ${step_rate}= Get From Dictionary ${prepared_tender_data.data.minimalStep} amount
  37 + ${items_description}= Get From Dictionary ${prepared_tender_data.data} description
36 38 ${quantity}= Get From Dictionary ${items[0]} quantity
37 39 ${cpv}= Get From Dictionary ${items[0].classification} id
38 40 ${dkpp_desc}= Get From Dictionary ${items[0].additionalClassifications[0]} description
39 41 ${dkpp_id}= Get From Dictionary ${items[0].additionalClassifications[0]} id
40 42 ${unit}= Get From Dictionary ${items[0].unit} name
41   - ${start_date}= Get From Dictionary ${tender_data.data.tenderPeriod} startDate
  43 + ${start_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} startDate
42 44 ${start_date}= convert_date_to_etender_format ${start_date}
43   - ${start_time}= Get From Dictionary ${tender_data.data.tenderPeriod} startDate
  45 + ${start_time}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} startDate
44 46 ${start_time}= convert_time_to_etender_format ${start_time}
45   - ${end_date}= Get From Dictionary ${tender_data.data.tenderPeriod} endDate
  47 + ${end_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} endDate
46 48 ${end_date}= convert_date_to_etender_format ${end_date}
47   - ${end_time}= Get From Dictionary ${tender_data.data.tenderPeriod} endDate
  49 + ${end_time}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} endDate
48 50 ${end_time}= convert_time_to_etender_format ${end_time}
49   - ${enquiry_end_date}= Get From Dictionary ${tender_data.data.enquiryPeriod} endDate
  51 + ${enquiry_end_date}= Get From Dictionary ${prepared_tender_data.data.enquiryPeriod} endDate
50 52 ${enquiry_end_date}= convert_date_to_etender_format ${enquiry_end_date}
51   - ${enquiry_end_time}= Get From Dictionary ${tender_data.data.enquiryPeriod} endDate
  53 + ${enquiry_end_time}= Get From Dictionary ${prepared_tender_data.data.enquiryPeriod} endDate
52 54 ${enquiry_end_time}= convert_time_to_etender_format ${enquiry_end_time}
53 55 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
54 56 Wait Until Page Contains Мої закупівлі 100
... ... @@ -88,8 +90,10 @@ ${locator.tenderId} jquery=h3
88 90 Click Element xpath=//div[contains(@class, 'form-actions')]//button[@type='submit']
89 91 Wait Until Page Contains [ТЕСТУВАННЯ] 100
90 92 Click Element xpath=//table[contains(@class, 'table table-hover table-striped table-bordered ng-scope ng-table')]//tr[1]//a
91   - ${tender_UAid}= Wait Until Keyword Succeeds 240sec 2sec get tender UAid
92   -### harcode Idis bacause issues on the E-tender side, to remove, 1 line:
  93 + Sleep 5
  94 + ${tender_UAid}= Get Text xpath=//div[contains(@class, "panel-heading")]
  95 + ${tender_UAid}= Get Substring ${tender_UAid} 7
  96 + ### harcode Idis bacause issues on the E-tender side, to remove, 1 line:
93 97 ${tender_UAid}= Convert To String UA-2015-08-03-000025
94 98 ${Ids}= Convert To String ${tender_UAid}
95 99 Run keyword if '${mode}' == 'multi' Set Multi Ids ${ARGUMENTS[0]} ${tender_UAid}
... ... @@ -99,14 +103,9 @@ Set Multi Ids
99 103 [Arguments] @{ARGUMENTS}
100 104 [Documentation]
101 105 ... ${ARGUMENTS[0]} == username
102   - ... ${ARGUMENTS[1]} == ${tender_UAid}
103   - ${id}= Oтримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
  106 + ${id}= Get Text xpath=//div[contains(@class, "panel-heading")]
104 107 ${Ids}= Create List ${tender_UAid} ${id}
105 108
106   -get tender UAid
107   - ${tender_UAid}= Get Text xpath=//div[contains(@class, "panel-heading")]
108   - ${tender_UAid}= Get Substring ${tender_UAid} 7 27
109   -
110 109 Oтримати internal id по UAid
111 110 [Arguments] @{ARGUMENTS}
112 111 [Documentation]
... ...
... ... @@ -20,7 +20,7 @@ ${file_path} local_path_to_file("TestDocument.docx")
20 20 Wait Until Page Contains Element jquery=a[href="/cabinet"]
21 21 Click Element jquery=a[href="/cabinet"]
22 22 Wait Until Page Contains Element name=email 10
23   -# Input text name=email mail
  23 + Input text name=email mail
24 24 Sleep 1
25 25 Input text name=email ${USERS.users['${username}'].login}
26 26 Sleep 2
... ... @@ -42,26 +42,26 @@ Pre Login
42 42 [Documentation]
43 43 ... ${ARGUMENTS[0]} == username
44 44 ... ${ARGUMENTS[1]} == tender_data
45   - ${tender_data}= Add_time_for_GUI_FrontEnds ${ARGUMENTS[1]}
46   - ${items}= Get From Dictionary ${tender_data.data} items
47   - ${title}= Get From Dictionary ${tender_data.data} title
48   - ${description}= Get From Dictionary ${tender_data.data} description
49   - ${budget}= Get From Dictionary ${tender_data.data.value} amount
50   - ${step_rate}= Get From Dictionary ${tender_data.data.minimalStep} amount
51   - ${items_description}= Get From Dictionary ${tender_data.data} description
  45 + ${prepared_tender_data}= Add_data_for_GUI_FrontEnds ${ARGUMENTS[1]}
  46 + ${items}= Get From Dictionary ${prepared_tender_data.data} items
  47 + ${title}= Get From Dictionary ${prepared_tender_data.data} title
  48 + ${description}= Get From Dictionary ${prepared_tender_data.data} description
  49 + ${budget}= Get From Dictionary ${prepared_tender_data.data.value} amount
  50 + ${step_rate}= Get From Dictionary ${prepared_tender_data.data.minimalStep} amount
  51 + ${items_description}= Get From Dictionary ${prepared_tender_data.data} description
52 52 ${quantity}= Get From Dictionary ${items[0]} quantity
53   - ${countryName}= Get From Dictionary ${tender_data.data.procuringEntity.address} countryName
  53 + ${countryName}= Get From Dictionary ${prepared_tender_data.data.procuringEntity.address} countryName
54 54 ${delivery_end_date}= Get From Dictionary ${items[0].deliveryDate} endDate
55 55 ${delivery_end_date}= convert_date_to_slash_format ${delivery_end_date}
56   - ${cpv}= Get From Dictionary ${items[0].classification} description_ua
  56 + ${cpv}= Convert To String Картонки
57 57 ${cpv_id}= Get From Dictionary ${items[0].classification} id
58 58 ${cpv_id1}= Replace String ${cpv_id} - _
59 59 ${dkpp_desc}= Get From Dictionary ${items[0].additionalClassifications[0]} description
60 60 ${dkpp_id}= Get From Dictionary ${items[0].additionalClassifications[0]} id
61 61 ${dkpp_id1}= Replace String ${dkpp_id} - _
62   - ${enquiry_end_date}= Get From Dictionary ${tender_data.data.enquiryPeriod} endDate
  62 + ${enquiry_end_date}= Get From Dictionary ${prepared_tender_data.data.enquiryPeriod} endDate
63 63 ${enquiry_end_date}= convert_date_to_slash_format ${enquiry_end_date}
64   - ${end_date}= Get From Dictionary ${tender_data.data.tenderPeriod} endDate
  64 + ${end_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} endDate
65 65 ${end_date}= convert_date_to_slash_format ${end_date}
66 66
67 67 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
... ... @@ -78,7 +78,6 @@ Pre Login
78 78 Input text name=items[0][item_deliveryDate_endDate] ${delivery_end_date}
79 79 Click Element xpath=//a[@class ='uploadFile']
80 80 Choose File xpath=//a[@class ='uploadFile'] ${file_path}
81   - Debug
82 81 Click Element xpath=//a[contains(@data-class, 'cpv')][./text()='Визначити за довідником']
83 82 Select Frame xpath=//iframe[contains(@src,'/js/classifications/cpv/uk.htm?relation=true')]
84 83 Input text id=search ${cpv}
... ... @@ -191,7 +190,6 @@ Set Multi Ids
191 190 ... ${ARGUMENTS[0]} == username
192 191 ... ${ARGUMENTS[1]} == tenderId
193 192 Switch browser ${ARGUMENTS[0]}
194   -
195 193 Go to ${BROKERS['${USERS.users['${username}'].broker}'].url}
196 194 Wait Until Page Contains Держзакупівлі.онлайн 10
197 195 # sleep 1
... ...
... ... @@ -15,7 +15,6 @@ ${locator.tenderId} jquery=h3
15 15 [Arguments] @{ARGUMENTS}
16 16 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо
17 17 ... ${ARGUMENTS[0]} == username
18   -
19 18 Open Browser ${BROKERS['${USERS.users['${username}'].broker}'].url} ${USERS.users['${username}'].browser} alias=${ARGUMENTS[0]}
20 19 Set Window Size @{USERS.users['${ARGUMENTS[0]}'].size}
21 20 Set Window Position @{USERS.users['${ARGUMENTS[0]}'].position}
... ... @@ -31,18 +30,18 @@ ${locator.tenderId} jquery=h3
31 30 [Arguments] @{ARGUMENTS}
32 31 [Documentation]
33 32 ... ${ARGUMENTS[0]} == username
34   - ... ${ARGUMENTS[1]} == tender_data
35   -
  33 + ... ${ARGUMENTS[1]} == initial_tender_data
36 34 ## Inicialisation
37   - ${items}= Get From Dictionary ${ARGUMENTS[1].data} items
38   - ${title}= Get From Dictionary ${ARGUMENTS[1].data} title
39   - ${description}= Get From Dictionary ${ARGUMENTS[1].data} description
40   - ${budget}= Get From Dictionary ${ARGUMENTS[1].data.value} amount
41   - ${step_rate}= Get From Dictionary ${ARGUMENTS[1].data.minimalStep} amount
42   - ${start_date}= Get From Dictionary ${ARGUMENTS[1].data.tenderPeriod} startDate
43   - ${end_date}= Get From Dictionary ${ARGUMENTS[1].data.tenderPeriod} endDate
44   - ${enquiry_start_date}= Get From Dictionary ${ARGUMENTS[1].data.enquiryPeriod} startDate
45   - ${enquiry_end_date}= Get From Dictionary ${ARGUMENTS[1].data.enquiryPeriod} endDate
  35 + ${prepared_tender_data}= Add_data_for_GUI_FrontEnds ${ARGUMENTS[1]}
  36 + ${items}= Get From Dictionary ${prepared_tender_data.data} items
  37 + ${title}= Get From Dictionary ${prepared_tender_data.data} title
  38 + ${description}= Get From Dictionary ${prepared_tender_data.data} description
  39 + ${budget}= Get From Dictionary ${prepared_tender_data.data.value} amount
  40 + ${step_rate}= Get From Dictionary ${prepared_tender_data.data.minimalStep} amount
  41 + ${start_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} startDate
  42 + ${end_date}= Get From Dictionary ${prepared_tender_data.data.tenderPeriod} endDate
  43 + ${enquiry_start_date}= Get From Dictionary ${prepared_tender_data.data.enquiryPeriod} startDate
  44 + ${enquiry_end_date}= Get From Dictionary ${prepared_tender_data.data.enquiryPeriod} endDate
46 45
47 46 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
48 47 Go To ${USERS.users['${username}'].homepage}
... ... @@ -109,7 +108,7 @@ Set datetime
109 108 ## Get values for item
110 109 ${items_description}= Get From Dictionary ${ARGUMENTS[0]} description
111 110 ${quantity}= Get From Dictionary ${ARGUMENTS[0]} quantity
112   - ${cpv}= Get From Dictionary ${ARGUMENTS[0].classification} description_ua
  111 + ${cpv}= Convert To String Картонки
113 112 ${dkpp_desc}= Get From Dictionary ${ARGUMENTS[0].additionalClassifications[0]} description
114 113 ${dkpp_id}= Get From Dictionary ${ARGUMENTS[0].additionalClassifications[0]} id
115 114 ${unit}= Get From Dictionary ${ARGUMENTS[0].unit} name
... ... @@ -161,10 +160,6 @@ Set datetime
161 160
162 161
163 162
164   -
165   -
166   -
167   -
168 163 #### Not reworked for Newtend ####
169 164
170 165 Oтримати internal id по UAid
... ...
... ... @@ -13,7 +13,7 @@ ${question_id} 0
13 13 ... ${ARGUMENTS[0]} == username
14 14 ... ${ARGUMENTS[1]} == tenderid
15 15 log many @{ARGUMENTS}
16   - ${tenders}= get_internal_id ${USERS.users['${ARGUMENTS[0]}'].client.get_tenders} ${USERS.users['${ARGUMENTS[0]}'].creation_date}
  16 + ${tenders}= get_internal_id ${USERS.users['${ARGUMENTS[0]}'].client.get_tenders} ${USERS.users['${ARGUMENTS[0]}'].creation_date}
17 17 :FOR ${tender} IN @{tenders}
18 18 \ log ${tender}
19 19 \ ${internal_id}= Run Keyword And Return If '${tender.tenderID}' == '${ARGUMENTS[1]}' Get Variable Value ${tender.id}
... ... @@ -26,16 +26,16 @@ ${question_id} 0
26 26 Підготувати клієнт для користувача
27 27 [Arguments] @{ARGUMENTS}
28 28 [Documentation] Відкрити брaвзер, створити обєкт api wrapper, тощо
29   - ${api_wrapper}= prepare_api_wrapper ${USERS.users['${ARGUMENTS[0]}'].api_key} ${API_HOST_URL} ${api_version}
  29 + ${api_wrapper}= prepare_api_wrapper ${USERS.users['${ARGUMENTS[0]}'].api_key} ${API_HOST_URL} ${api_version}
30 30 ${creation_date} = get_date
31 31 Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} creation_date ${creation_date}
32 32 Set To Dictionary ${USERS.users['${ARGUMENTS[0]}']} client ${api_wrapper}
33 33 Log Variables
34   -
35   -Підготувати дані для оголошення тендера
  34 +
  35 +Підготувати дані для оголошення тендера
36 36 ${INITIAL_TENDER_DATA}= prepare_test_tender_data
37 37 [return] ${INITIAL_TENDER_DATA}
38   -
  38 +
39 39 Створити тендер
40 40 [Arguments] @{ARGUMENTS}
41 41 ${TENDER_DATA}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} create_tender ${ARGUMENTS[1]}
... ... @@ -61,7 +61,7 @@ ${question_id} 0
61 61 Log tender_id: ${TENDER_DATA.data.id}
62 62 Set Global Variable ${TENDER_DATA}
63 63 [return] ${TENDER_DATA}
64   -
  64 +
65 65 Пошук тендера по ідентифікатору
66 66 [Arguments] @{ARGUMENTS}
67 67 [Documentation]
... ... @@ -191,7 +191,7 @@ ${question_id} 0
191 191 ${complaint}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} _create_tender_resource_item ${tender} ${ARGUMENTS[2]} complaints
192 192 Log object data ${complaint} complaint
193 193
194   -порівняти скаргу
  194 +порівняти скаргу
195 195 [Documentation]
196 196 ... ${ARGUMENTS[0]} == username
197 197 ... ${ARGUMENTS[1]} == tender_uid
... ... @@ -199,10 +199,10 @@ ${question_id} 0
199 199 [Arguments] @{ARGUMENTS}
200 200 ${internalid}= отримати internal id по UAid ${ARGUMENTS[0]} ${ARGUMENTS[1]}
201 201 ${tender}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} get_tender ${internalid}
202   - ${complaint}= Get Variable Value ${tender.data.complaints[0]}
  202 + ${complaint}= Get Variable Value ${tender.data.complaints[0]}
203 203 log ${complaint}
204 204 log ${ARGUMENTS[2]}
205   - #TODO: COMPARE
  205 + #TODO: COMPARE
206 206 #Dictionary Should Contain Sub Dictionary ${complaint} ${ARGUMENTS[2].data}
207 207 #:FOR ${element} IN ${ARGUMENTS[2].data}
208 208 #\ log ${element}
... ... @@ -315,9 +315,9 @@ ${question_id} 0
315 315 [return] ${uploaded_file}
316 316
317 317
318   -
319 318
320   -Завантажити документ
  319 +
  320 +Завантажити документ
321 321 [Documentation]
322 322 ... ${ARGUMENTS[0]} == username
323 323 ... ${ARGUMENTS[1]} == filepath
... ... @@ -332,7 +332,7 @@ ${question_id} 0
332 332 ${reply}= Call Method ${USERS.users['${ARGUMENTS[0]}'].client} upload_document ${tender} ${ARGUMENTS[1]}
333 333 Log object data ${reply} reply
334 334 [return] ${reply}
335   -
  335 +
336 336 Отримати пропозиції
337 337 [Documentation]
338 338 ... ${ARGUMENTS[0]} == username
... ...
... ... @@ -5,10 +5,10 @@ Library DateTime
5 5
6 6 *** Variables ***
7 7 ${file_path} local_path_to_file("TestDocument.docx")
8   -# ${file_path} /home/vbilos/openprocurement.robottests.buildout/Document.docx
9 8 ${mail} test@mail.com
10 9 ${telephone} +380976535447
11 10
  11 +
12 12 *** Keywords ***
13 13 Підготувати клієнт для користувача
14 14 [Arguments] @{ARGUMENTS}
... ... @@ -31,23 +31,23 @@ ${telephone} +380976535447
31 31 [Documentation]
32 32 ... ${ARGUMENTS[0]} == username
33 33 ... ${ARGUMENTS[1]} == tender_data
34   - ${tender_data}= Add_time_for_GUI_FrontEnds ${ARGUMENTS[1]}
35   - ${items}= Get From Dictionary ${tender_data.data} items
36   - ${title}= Get From Dictionary ${tender_data.data} title
37   - ${description}= Get From Dictionary ${tender_data.data} description
38   - ${budget}= Get From Dictionary ${tender_data.data.value} amount
39   - ${step_rate}= Get From Dictionary ${tender_data.data.minimalStep} amount
40   - ${countryName}= Get From Dictionary ${tender_data.data.procuringEntity.address} countryName
  34 + ${prepared_tender_data}= Add_data_for_GUI_FrontEnds ${ARGUMENTS[1]}
  35 + ${items}= Get From Dictionary ${prepared_tender_data.data} items
  36 + ${title}= Get From Dictionary ${prepared_tender_data.data} title
  37 + ${description}= Get From Dictionary ${prepared_tender_data.data} description
  38 + ${budget}= Get From Dictionary ${prepared_tender_data.data.value} amount
  39 + ${step_rate}= Get From Dictionary ${prepared_tender_data.data.minimalStep} amount
  40 + ${countryName}= Get From Dictionary ${prepared_tender_data.data.procuringEntity.address} countryName
41 41 ${delivery_end_date}= Get From Dictionary ${items[0].deliveryDate} endDate
42 42 ${delivery_end_date}= convert_date_to_prom_format ${delivery_end_date}
43   - ${cpv}= Get From Dictionary ${items[0].classification} description_ua
  43 + ${cpv}= Convert To String "Картонки"
44 44 ${cpv_id}= Get From Dictionary ${items[0].classification} id
45 45 ${cpv_id_1}= Get Substring ${cpv_id} 0 3
46 46 ${dkpp_desc}= Get From Dictionary ${items[0].additionalClassifications[0]} description
47 47 ${dkpp_id}= Get From Dictionary ${items[0].additionalClassifications[0]} id
48 48 ${code}= Get From Dictionary ${items[0].unit} code
49 49 ${quantity}= Get From Dictionary ${items[0]} quantity
50   - ${name}= Get From Dictionary ${tender_data.data.procuringEntity.contactPoint} name
  50 + ${name}= Get From Dictionary ${prepared_tender_data.data.procuringEntity.contactPoint} name
51 51
52 52 Selenium2Library.Switch Browser ${ARGUMENTS[0]}
53 53 Wait Until Page Contains Element xpath=//*[contains(@class, 'ui-button-text ui-c')][./text()='Нова закупівля'] 10
... ...
... ... @@ -17,7 +17,7 @@ users:
17 17 homepage: "http://uat.e-tender.biz/#/profile"
18 18 login: Misha2
19 19 password: Password1
20   - browser: firefox
  20 + browser: chrome
21 21 position: [0, 0]
22 22 size: [740, 550]
23 23 E-tender_Provider1:
... ... @@ -26,7 +26,7 @@ users:
26 26 homepage: "http://uat.e-tender.biz/#/profile"
27 27 login: st_org
28 28 password: 12345678
29   - browser: firefox
  29 + browser: chrome
30 30 position: [700, 0]
31 31 size: [640, 450]
32 32 E-tender_Provider2:
... ... @@ -35,7 +35,7 @@ users:
35 35 homepage: "http://uat.e-tender.biz/#/profile"
36 36 login: provider2
37 37 password: Qa123456
38   - browser: firefox
  38 + browser: chrome
39 39 position: [700, 0]
40 40 size: [640, 450]
41 41 E-tender_Viewer:
... ... @@ -80,7 +80,7 @@ users:
80 80 homepage: "http://dev23.newtend.com/openprocurement/#/home/page/1"
81 81 login: openprocurement@mailinator.com
82 82 password: 123123
83   - browser: firefox
  83 + browser: chrome
84 84 position: [0, 0]
85 85 size: [640, 450]
86 86 Netcast_Owner:
... ... @@ -89,25 +89,25 @@ users:
89 89 homepage: "http://dz2.byustudio.in.ua"
90 90 login: ovramet.s@gmail.com
91 91 password: Password1
92   - browser: firefox
  92 + browser: chrome
93 93 position: [0, 0]
94   - size: [1920, 1080]
  94 + size: [920, 580]
95 95 Netcast_Provider1:
96 96 broker: Netcast
97 97 username: Netcasttest
98 98 homepage: "http://dz2.byustudio.in.ua"
99 99 login: halyna.khimka@gmail.com
100 100 password: JHO5VUp5n
101   - browser: firefox
102   - position: [0, 450]
103   - size: [1920, 1080]
  101 + browser: chrome
  102 + position: [0, 900]
  103 + size: [920, 580]
104 104 Publicbid_Owner:
105 105 broker: Publicbid
106 106 username: Publicbid
107 107 homepage: "https://public-bid.com.ua/test/"
108 108 login: yaroslav1boyko@gmail.com
109 109 password: Password1
110   - browser: firefox
  110 + browser: chrome
111 111 position: [0, 0]
112 112 size: [740, 550]
113 113 Newtend_Provider2:
... ... @@ -116,12 +116,12 @@ users:
116 116 homepage: "http://dev23.newtend.com/openprocurement/tenders"
117 117 login: openprocboss@mailinator.com
118 118 password: 123123
119   - browser: firefox
  119 + browser: chrome
120 120 position: [700, 0]
121 121 size: [640, 450]
122 122 Newtend_Viewer:
123 123 broker: Newtend
124 124 username: Newtendtest
125   - browser: firefox
  125 + browser: chrome
126 126 position: [0, 0]
127 127 size: [640, 450]
\ No newline at end of file
... ...
... ... @@ -73,8 +73,7 @@ def test_tender_data(period_interval=2):
73 73 "classification": {
74 74 "scheme": u"CPV",
75 75 "id": u"44617100-9",
76   - "description": u"Cartons",
77   - "description_ua": u"Картонки",
  76 + "description": u"Cartons"
78 77 },
79 78 "additionalClassifications": [
80 79 {
... ... @@ -243,8 +242,7 @@ def test_tender_data_multiple_lots(period_interval=2):
243 242 "classification": {
244 243 "scheme": u"CPV",
245 244 "id": u"44617100-9",
246   - "description": u"Cartons",
247   - "description_ua": u"Картонки",
  245 + "description": u"Cartons"
248 246 },
249 247 "additionalClassifications": [
250 248 {
... ...
... ... @@ -27,21 +27,6 @@ TIMEZONE = timezone('Europe/Kiev')
27 27 def get_date():
28 28 return datetime.now().isoformat()
29 29
30   -def convert_date_to_slash_format(isodate):
31   - iso_dt=parse_date(isodate)
32   - date_string = iso_dt.strftime("%d/%m/%Y")
33   - return date_string
34   -
35   -def convert_date_to_etender_format(isodate):
36   - iso_dt=parse_date(isodate)
37   - date_string = iso_dt.strftime("%d-%m-%Y")
38   - return date_string
39   -
40   -def convert_time_to_etender_format(isodate):
41   - iso_dt=parse_date(isodate)
42   - time_string = iso_dt.strftime("%H:%M")
43   - return time_string
44   -
45 30 def change_state(arguments):
46 31 try:
47 32 if arguments[0] == "shouldfail":
... ... @@ -94,7 +79,6 @@ def load_initial_data_from(file_name):
94 79 elif file_name.endswith(".yaml"):
95 80 return fromYAML(file_obj)
96 81
97   -
98 82 def prepare_test_tender_data(period_interval=2, mode='single'):
99 83 if mode == 'single':
100 84 return munchify({'data': test_tender_data(period_interval=period_interval)})
... ... @@ -102,21 +86,16 @@ def prepare_test_tender_data(period_interval=2, mode='single'):
102 86 return munchify({'data': test_tender_data_multiple_lots(period_interval=period_interval)})
103 87 raise ValueError('A very specific bad thing happened')
104 88
105   -
106 89 def run_keyword_and_ignore_keyword_definations(name, *args):
107 90 """Runs the given keyword with given arguments and returns the status as a Boolean value.
108   -
109 91 This keyword returns `True` if the keyword that is executed succeeds and
110 92 `False` if it fails. This is useful, for example, in combination with
111 93 `Run Keyword If`. If you are interested in the error message or return
112 94 value, use `Run Keyword And Ignore Error` instead.
113   -
114 95 The keyword name and arguments work as in `Run Keyword`.
115   -
116 96 Example:
117 97 | ${passed} = | `Run Keyword And Return Status` | Keyword | args |
118 98 | `Run Keyword If` | ${passed} | Another keyword |
119   -
120 99 New in Robot Framework 2.7.6.
121 100 """
122 101 try:
... ... @@ -126,7 +105,6 @@ def run_keyword_and_ignore_keyword_definations(name, *args):
126 105 return "FAIL", ""
127 106 return status, _
128 107
129   -
130 108 def set_tender_periods(tender):
131 109 now = datetime.now()
132 110 tender.data.enquiryPeriod.endDate = (now + timedelta(minutes=2)).isoformat()
... ... @@ -134,17 +112,14 @@ def set_tender_periods(tender):
134 112 tender.data.tenderPeriod.endDate = (now + timedelta(minutes=4)).isoformat()
135 113 return tender
136 114
137   -
138 115 def set_access_key(tender, access_token):
139 116 tender.access = munchify({"token": access_token})
140 117 return tender
141 118
142   -
143 119 def set_to_object(obj, attribute, value):
144 120 xpathset(obj, attribute.replace('.', '/'), value)
145 121 return obj
146 122
147   -
148 123 def get_from_object(obj, attribute):
149 124 """Gets data from a dictionary using a dotted accessor-string"""
150 125 jsonpath_expr = parse_path(attribute)
... ... @@ -153,7 +128,6 @@ def get_from_object(obj, attribute):
153 128 return return_list[0]
154 129 return None
155 130
156   -
157 131 def wait_to_date(date_stamp):
158 132 date = parse(date_stamp)
159 133 LOGGER.log_message(Message("date: {}".format(date.isoformat()), "INFO"))
... ... @@ -165,6 +139,21 @@ def wait_to_date(date_stamp):
165 139 return 0
166 140 return wait_seconds
167 141
  142 +def convert_date_to_slash_format(isodate):
  143 + iso_dt=parse_date(isodate)
  144 + date_string = iso_dt.strftime("%d/%m/%Y")
  145 + return date_string
  146 +
  147 +def convert_date_to_etender_format(isodate):
  148 + iso_dt=parse_date(isodate)
  149 + date_string = iso_dt.strftime("%d-%m-%Y")
  150 + return date_string
  151 +
  152 +def convert_time_to_etender_format(isodate):
  153 + iso_dt=parse_date(isodate)
  154 + time_string = iso_dt.strftime("%H:%M")
  155 + return time_string
  156 +
168 157 def newtend_date_picker_index(isodate):
169 158 now = datetime.today()
170 159 date_str = '01' + str(now.month) + str(now.year)
... ... @@ -177,15 +166,15 @@ def newtend_date_picker_index(isodate):
177 166 mod = calendar.monthrange(now.year, now.month)[1] + mod
178 167 return mod + iso_dt.day
179 168
180   -def Add_time_for_GUI_FrontEnds(INITIAL_TENDER_DATA):
  169 +def Add_data_for_GUI_FrontEnds(INITIAL_TENDER_DATA):
181 170 now = datetime.now()
182 171 INITIAL_TENDER_DATA.data.enquiryPeriod['startDate'] = (now + timedelta(minutes=2)).isoformat()
183 172 INITIAL_TENDER_DATA.data.enquiryPeriod['endDate'] = (now + timedelta(minutes=3)).isoformat()
184 173 INITIAL_TENDER_DATA.data.tenderPeriod['startDate'] = (now + timedelta(minutes=4)).isoformat()
185 174 INITIAL_TENDER_DATA.data.tenderPeriod['endDate'] = (now + timedelta(minutes=5)).isoformat()
186 175 return INITIAL_TENDER_DATA
187   -
  176 +
188 177 def local_path_to_file( file_name ):
189   - path = os.getcwd()
190   - path = path.split("brokers", 1)[0] + "documents/" + file_name
191   - return path
\ No newline at end of file
  178 + path = os.getcwd()
  179 + path = path.split("brokers", 1)[0] + "documents/" + file_name
  180 + return path
... ...
... ... @@ -387,7 +387,6 @@ ${question_id} 0
387 387 ${bid_doc_upload_fail}= Викликати для учасника ${provider1} Завантажити документ в ставку shouldfail ${filepath} ${TENDER['TENDER_UAID']}
388 388 Set To Dictionary ${USERS.users['${provider1}'].bidresponces} bid_doc_upload_fail ${bid_doc_upload_fail}
389 389
390   -
391 390 Неможливість змінити існуючу документацію цінової пропозиції після закінчення прийому пропозицій
392 391 [Tags] ${USERS.users['${provider1}'].broker}:
393 392 ${filepath}= create_fake_doc
... ... @@ -396,9 +395,8 @@ ${question_id} 0
396 395 ${bid_doc_modified_failed}= Викликати для учасника ${provider1} Змінити документ в ставці shouldfail ${filepath} ${bidid} ${docid}
397 396 Set To Dictionary ${USERS.users['${provider}'].bidresponces} bid_doc_modified_failed ${bid_doc_modified_failed}
398 397
399   -
400 398 Вичитати цінову пропозицію
401   -# sleep 120
  399 + #sleep 120
402 400 [Tags] ${USERS.users['${provider1}'].broker}: Можливість подати цінову пропозицію
403 401 ${bidid}= Get Variable Value ${USERS.users['${provider1}'].bidresponces['resp'].data.id}
404 402 ${token}= Get Variable Value ${USERS.users['${provider1}'].bidresponces['resp'].access.token}
... ...
Please register or login to post a comment