Skip to content

Commit

Permalink
Merge branch 'a195747282117598_complaint_active_award'
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroman0
kroman0 committed Oct 24, 2016
2 parents 215512c + 9f8f1be commit 8493302
Showing 1 changed file with 51 additions and 40 deletions.
91 changes: 51 additions & 40 deletions openprocurement/tender/competitivedialogue/tests/stage2/award.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1054,6 +1054,8 @@ def setUp(self):
# Get award
response = self.app.get('/tenders/{}/awards'.format(self.tender_id))
self.award_id = response.json['data'][0]['id']
self.app.authorization = ('Basic', ('broker', ''))
self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(self.tender_id, self.award_id, self.tender_token), {'data': {'status': 'active', "qualified": True, "eligible": True}})
self.bid_token = self.initial_bids_tokens[self.bids[0]['id']]
self.app.authorization = ('Basic', ('broker', ''))

Expand Down Expand Up @@ -1231,12 +1233,12 @@ def test_patch_tender_award_complaint(self):
self.assertEqual(response.json['errors'][0]['description'], 'Forbidden')

# set award to status active
response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.tender_token),
{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['data']['status'], 'active')
#response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.tender_token),
#{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.content_type, 'application/json')
#self.assertEqual(response.json['data']['status'], 'active')

# patch complaint
response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
Expand Down Expand Up @@ -1505,6 +1507,7 @@ def setUp(self):
'lotID': bid['lotValues'][0]['relatedLot']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
self.bid_token = self.initial_bids_tokens[self.bids[0]['id']]
self.app.authorization = ('Basic', ('broker', ''))

Expand Down Expand Up @@ -1551,12 +1554,12 @@ def test_patch_tender_award_complaint(self):
complaint = response.json['data']
owner_token = response.json['access']['token']

response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.tender_token),
{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['data']['status'], 'active')
#response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.tender_token),
#{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.content_type, 'application/json')
#self.assertEqual(response.json['data']['status'], 'active')

response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
self.tender_id, self.award_id, complaint['id'], owner_token), {'data': {'status': 'pending'}})
Expand Down Expand Up @@ -1755,12 +1758,12 @@ def test_create_tender_award_complaint(self):
self.assertEqual(response.json['errors'][0]['description'], 'Can add complaint only in active lot status')

def test_patch_tender_award_complaint(self):
response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.tender_token),
{'data': {'status': 'unsuccessful'}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['data']['status'], 'unsuccessful')
#response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.tender_token),
#{'data': {'status': 'unsuccessful'}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.content_type, 'application/json')
#self.assertEqual(response.json['data']['status'], 'unsuccessful')

response = self.app.post_json('/tenders/{}/awards/{}/complaints?acc_token={}'.format(
self.tender_id, self.award_id, self.bid_token),
Expand Down Expand Up @@ -1808,6 +1811,7 @@ def setUp(self):
'bid_id': self.bids[0]['id']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
# Create complaint for award
response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(self.tender_id, self.award_id),
{'data': {'title': 'complaint title',
Expand Down Expand Up @@ -2194,11 +2198,14 @@ def setUp(self):
# Create award
bid = self.bids[0]
self.app.authorization = ('Basic', ('token', ''))
self.app.post_json('/tenders/{}/awards'.format(self.tender_id),
{'data': {'suppliers': [author], 'status': 'pending', 'bid_id': bid['id'], 'lotID': bid['lotValues'][1]['relatedLot']}})
response = self.app.post_json('/tenders/{}/awards'.format(self.tender_id),
{'data': {'suppliers': [author], 'status': 'pending',
'bid_id': bid['id'], 'lotID': bid['lotValues'][0]['relatedLot']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
# Create complaint for award
response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(self.tender_id, self.award_id),
{'data': {'title': 'complaint title',
Expand Down Expand Up @@ -2346,11 +2353,11 @@ def test_put_tender_award_complaint_document(self):
self.assertEqual(response.content_length, 8)
self.assertEqual(response.body, 'content3')

response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.complaint_id, self.complaint_owner_token),
{'data': {'status': 'pending'}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.json['data']['status'], 'pending')
#response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.complaint_id, self.complaint_owner_token),
#{'data': {'status': 'pending'}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.json['data']['status'], 'pending')

response = self.app.put(
'/tenders/{}/awards/{}/complaints/{}/documents/{}?acc_token={}'.format(self.tender_id, self.award_id,
Expand Down Expand Up @@ -3768,6 +3775,7 @@ def setUp(self):
'bid_id': self.bids[0]['id']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
self.app.authorization = auth
self.bid_token = self.initial_bids_tokens[self.bids[0]['id']]

Expand Down Expand Up @@ -3936,12 +3944,12 @@ def test_patch_tender_award_complaint(self):
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]['description'], 'Forbidden')

response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.tender_token),
{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['data']['status'], 'active')
#response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.tender_token),
#{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.content_type, 'application/json')
#self.assertEqual(response.json['data']['status'], 'active')

response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
self.tender_id, self.award_id, complaint['id'], owner_token),
Expand Down Expand Up @@ -4154,6 +4162,7 @@ def setUp(self):
'bid_id': bid['id'], 'lotID': bid['lotValues'][0]['relatedLot']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
self.bid_token = self.initial_bids_tokens[self.bids[0]['id']]
self.app.authorization = auth

Expand Down Expand Up @@ -4196,12 +4205,12 @@ def test_patch_tender_award_complaint(self):
complaint = response.json['data']
owner_token = response.json['access']['token']

response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.tender_token),
{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['data']['status'], 'active')
#response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.tender_token),
#{'data': {'status': 'active', 'qualified': True, 'eligible': True}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.content_type, 'application/json')
#self.assertEqual(response.json['data']['status'], 'active')

response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}?acc_token={}'.format(
self.tender_id, self.award_id, complaint['id'], owner_token), {'data': {'status': 'pending'}})
Expand Down Expand Up @@ -4389,11 +4398,11 @@ def test_create_tender_award_complaint(self):
self.assertEqual(response.json['errors'][0]['description'], 'Can add complaint only in active lot status')

def test_patch_tender_award_complaint(self):
response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
self.tender_id, self.award_id, self.tender_token), {'data': {'status': 'unsuccessful'}})
self.assertEqual(response.status, '200 OK')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['data']['status'], 'unsuccessful')
#response = self.app.patch_json('/tenders/{}/awards/{}?acc_token={}'.format(
#self.tender_id, self.award_id, self.tender_token), {'data': {'status': 'unsuccessful'}})
#self.assertEqual(response.status, '200 OK')
#self.assertEqual(response.content_type, 'application/json')
#self.assertEqual(response.json['data']['status'], 'unsuccessful')

response = self.app.post_json('/tenders/{}/awards/{}/complaints?acc_token={}'.format(
self.tender_id, self.award_id, self.initial_bids_tokens[self.bids[0]['id']]),
Expand Down Expand Up @@ -4443,6 +4452,7 @@ def setUp(self):
'bid_id': self.bids[0]['id']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
self.app.authorization = auth

# Create complaint for award
Expand Down Expand Up @@ -4847,6 +4857,7 @@ def setUp(self):
'bid_id': bid['id'], 'lotID': bid['lotValues'][0]['relatedLot']}})
award = response.json['data']
self.award_id = award['id']
self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, self.award_id), {'data': {'status': 'active', "qualified": True, "eligible": True}})
self.app.authorization = auth
# Create complaint for award
response = self.app.post_json('/tenders/{}/awards/{}/complaints?acc_token={}'.format(
Expand Down

0 comments on commit 8493302

Please sign in to comment.