Commit 3ad9b7c4823e65a2c76050849327a0133dbe5b4f
Merge pull request #115 from mykhaly/add_VATI_to_initial_data
Add valueAddedTaxIncluded to test_tender_data
Showing
2 changed files
with
26 additions
and
7 deletions
@@ -57,7 +57,8 @@ def test_tender_data(intervals, periods=("enquiry", "tender")): | @@ -57,7 +57,8 @@ def test_tender_data(intervals, periods=("enquiry", "tender")): | ||
57 | }, | 57 | }, |
58 | "value": { | 58 | "value": { |
59 | "amount": 50000.99, | 59 | "amount": 50000.99, |
60 | - "currency": u"UAH" | 60 | + "currency": u"UAH", |
61 | + "valueAddedTaxIncluded": True | ||
61 | }, | 62 | }, |
62 | "minimalStep": { | 63 | "minimalStep": { |
63 | "amount": 100.1, | 64 | "amount": 100.1, |
@@ -452,7 +453,7 @@ def test_bid_data(): | @@ -452,7 +453,7 @@ def test_bid_data(): | ||
452 | "value": { | 453 | "value": { |
453 | "currency": "UAH", | 454 | "currency": "UAH", |
454 | "amount": 500, | 455 | "amount": 500, |
455 | - "valueAddedTaxIncluded": "true" | 456 | + "valueAddedTaxIncluded": True |
456 | } | 457 | } |
457 | } | 458 | } |
458 | }) | 459 | }) |
@@ -484,7 +485,7 @@ def test_lots_bid_data(): | @@ -484,7 +485,7 @@ def test_lots_bid_data(): | ||
484 | "value": { | 485 | "value": { |
485 | "currency": "UAH", | 486 | "currency": "UAH", |
486 | "amount": fake.random_int(max=1999), | 487 | "amount": fake.random_int(max=1999), |
487 | - "valueAddedTaxIncluded": "true" | 488 | + "valueAddedTaxIncluded": True |
488 | }, | 489 | }, |
489 | "relatedLot": "3c8f387879de4c38957402dbdb8b31af", | 490 | "relatedLot": "3c8f387879de4c38957402dbdb8b31af", |
490 | "date": "2015-11-01T12:43:12.482645+02:00" | 491 | "date": "2015-11-01T12:43:12.482645+02:00" |
@@ -493,7 +494,7 @@ def test_lots_bid_data(): | @@ -493,7 +494,7 @@ def test_lots_bid_data(): | ||
493 | "value": { | 494 | "value": { |
494 | "currency": "UAH", | 495 | "currency": "UAH", |
495 | "amount": fake.random_int(max=1999), | 496 | "amount": fake.random_int(max=1999), |
496 | - "valueAddedTaxIncluded": "true" | 497 | + "valueAddedTaxIncluded": True |
497 | }, | 498 | }, |
498 | "relatedLot": "bcac8d2ceb5f4227b841a2211f5cb646", | 499 | "relatedLot": "bcac8d2ceb5f4227b841a2211f5cb646", |
499 | "date": "2015-11-01T12:43:12.482645+02:00" | 500 | "date": "2015-11-01T12:43:12.482645+02:00" |
@@ -509,7 +510,7 @@ def auction_bid(): | @@ -509,7 +510,7 @@ def auction_bid(): | ||
509 | "value": { | 510 | "value": { |
510 | "amount": 200, | 511 | "amount": 200, |
511 | "currency": "UAH", | 512 | "currency": "UAH", |
512 | - "valueAddedTaxIncluded": "true" | 513 | + "valueAddedTaxIncluded": True |
513 | } | 514 | } |
514 | } | 515 | } |
515 | }) | 516 | }) |
@@ -644,12 +645,12 @@ def test_lot_data(): | @@ -644,12 +645,12 @@ def test_lot_data(): | ||
644 | "value": { | 645 | "value": { |
645 | "currency": "UAH", | 646 | "currency": "UAH", |
646 | "amount": 2000 + fake.pyfloat(left_digits=4, right_digits=1, positive=True), | 647 | "amount": 2000 + fake.pyfloat(left_digits=4, right_digits=1, positive=True), |
647 | - "valueAddedTaxIncluded": "true" | 648 | + "valueAddedTaxIncluded": True |
648 | }, | 649 | }, |
649 | "minimalStep": { | 650 | "minimalStep": { |
650 | "currency": "UAH", | 651 | "currency": "UAH", |
651 | "amount": 30.0, | 652 | "amount": 30.0, |
652 | - "valueAddedTaxIncluded": "true" | 653 | + "valueAddedTaxIncluded": True |
653 | }, | 654 | }, |
654 | "status": "active" | 655 | "status": "active" |
655 | }) | 656 | }) |
@@ -87,6 +87,24 @@ ${question_id} 0 | @@ -87,6 +87,24 @@ ${question_id} 0 | ||
87 | Звірити поле тендера ${viewer} ${USERS.users['${tender_owner}'].initial_data} value.amount | 87 | Звірити поле тендера ${viewer} ${USERS.users['${tender_owner}'].initial_data} value.amount |
88 | 88 | ||
89 | 89 | ||
90 | +Відображення валюти оголошеного тендера | ||
91 | + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних оголошеного тендера | ||
92 | + ... viewer | ||
93 | + ... ${USERS.users['${viewer}'].broker} | ||
94 | + Звірити поле тендера ${viewer} | ||
95 | + ... ${USERS.users['${tender_owner}'].initial_data} | ||
96 | + ... value.currency | ||
97 | + | ||
98 | + | ||
99 | +Відображення ПДВ в бюджеті оголошеного тендера | ||
100 | + [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних оголошеного тендера | ||
101 | + ... viewer | ||
102 | + ... ${USERS.users['${viewer}'].broker} | ||
103 | + Звірити поле тендера ${viewer} | ||
104 | + ... ${USERS.users['${tender_owner}'].initial_data} | ||
105 | + ... value.valueAddedTaxIncluded | ||
106 | + | ||
107 | + | ||
90 | Відображення tenderID оголошеного тендера | 108 | Відображення tenderID оголошеного тендера |
91 | [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних оголошеного тендера | 109 | [Tags] ${USERS.users['${viewer}'].broker}: Відображення основних даних оголошеного тендера |
92 | ... viewer | 110 | ... viewer |
Please
register
or
login
to post a comment