Skip to content

Commit

Permalink
Added more info about status in errors
Browse files Browse the repository at this point in the history
  • Loading branch information
@kroman0
kroman0 committed Jan 14, 2015
1 parent 72e37a4 commit 0902558
Show file tree
Hide file tree
Showing 22 changed files with 107 additions and 121 deletions.
12 changes: 6 additions & 6 deletions src/openprocurement/api/tests/auction.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def test_get_tender_auction(self):
response = self.app.get('/tenders/{}/auction'.format(self.tender_id), status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't get auction info in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't get auction info in current (active.tendering) tender status")

self.set_status('active.auction')

Expand Down Expand Up @@ -94,14 +94,14 @@ def test_get_tender_auction(self):
response = self.app.get('/tenders/{}/auction'.format(self.tender_id), status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't get auction info in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't get auction info in current (active.qualification) tender status")

def test_post_tender_auction(self):
self.app.authorization = ('Basic', ('auction', ''))
response = self.app.post_json('/tenders/{}/auction'.format(self.tender_id), {'data': {}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current (active.tendering) tender status")

self.app.authorization = ('Basic', ('token', ''))
self.set_status('active.auction')
Expand Down Expand Up @@ -186,14 +186,14 @@ def test_post_tender_auction(self):
response = self.app.post_json('/tenders/{}/auction'.format(self.tender_id), {'data': patch_data}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current (active.qualification) tender status")

def test_patch_tender_auction(self):
self.app.authorization = ('Basic', ('auction', ''))
response = self.app.patch_json('/tenders/{}/auction'.format(self.tender_id), {'data': {}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current (active.tendering) tender status")

self.app.authorization = ('Basic', ('token', ''))
self.set_status('active.auction')
Expand Down Expand Up @@ -265,7 +265,7 @@ def test_patch_tender_auction(self):
response = self.app.patch_json('/tenders/{}/auction'.format(self.tender_id), {'data': patch_data}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't report auction results in current (complete) tender status")


def suite():
Expand Down
34 changes: 17 additions & 17 deletions src/openprocurement/api/tests/award.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ def test_create_tender_award_invalid(self):
self.tender_id), {'data': {'suppliers': [test_tender_data["procuringEntity"]], 'status': 'pending', 'bid_id': self.initial_bids[0]['id']}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can\'t create award in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't create award in current (complete) tender status")

def test_create_tender_award(self):
response = self.app.post_json('/tenders/{}/awards'.format(
Expand Down Expand Up @@ -205,7 +205,7 @@ def test_patch_tender_award(self):
response = self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, award['id']), {"data": {"status": "pending"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update award in current status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update award in current (unsuccessful) status")

response = self.app.get('/tenders/{}/awards'.format(self.tender_id))
self.assertEqual(response.status, '200 OK')
Expand All @@ -223,7 +223,7 @@ def test_patch_tender_award(self):
response = self.app.patch_json('/tenders/{}/awards/{}'.format(self.tender_id, award['id']), {"data": {"status": "unsuccessful"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update award in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update award in current (complete) tender status")

def test_get_tender_award(self):
response = self.app.post_json('/tenders/{}/awards'.format(
Expand Down Expand Up @@ -391,7 +391,7 @@ def test_create_tender_award_complaint(self):
self.tender_id, self.award_id), {'data': {'title': 'complaint title', 'description': 'complaint description', 'author': test_tender_data["procuringEntity"]}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't add complaint in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't add complaint in current (complete) tender status")

def test_patch_tender_award_complaint(self):
response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(
Expand Down Expand Up @@ -437,7 +437,7 @@ def test_patch_tender_award_complaint(self):
response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(self.tender_id, self.award_id, complaint['id']), {"data": {"status": "resolved", "resolution": "resolution text"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update complaint in current status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update complaint in current (resolved) status")

response = self.app.patch_json('/tenders/{}/awards/some_id/complaints/some_id'.format(self.tender_id), {"data": {"status": "resolved", "resolution": "resolution text"}}, status=404)
self.assertEqual(response.status, '404 Not Found')
Expand All @@ -459,7 +459,7 @@ def test_patch_tender_award_complaint(self):
response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}'.format(self.tender_id, self.award_id, complaint['id']), {"data": {"status": "resolved", "resolution": "resolution text"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update complaint in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update complaint in current (complete) tender status")

def test_get_tender_award_complaint(self):
response = self.app.post_json('/tenders/{}/awards/{}/complaints'.format(
Expand Down Expand Up @@ -722,7 +722,7 @@ def test_create_tender_award_complaint_document(self):
self.tender_id, self.award_id, self.complaint_id), upload_files=[('file', 'name.doc', 'content')], status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't add document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't add document in current (complete) tender status")

def test_put_tender_award_complaint_document(self):
response = self.app.post('/tenders/{}/awards/{}/complaints/{}/documents'.format(
Expand Down Expand Up @@ -784,7 +784,7 @@ def test_put_tender_award_complaint_document(self):
self.tender_id, self.award_id, self.complaint_id, doc_id), upload_files=[('file', 'name.doc', 'content3')], status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current (complete) tender status")

def test_patch_tender_award_complaint_document(self):
response = self.app.post('/tenders/{}/awards/{}/complaints/{}/documents'.format(
Expand All @@ -811,7 +811,7 @@ def test_patch_tender_award_complaint_document(self):
response = self.app.patch_json('/tenders/{}/awards/{}/complaints/{}/documents/{}'.format(self.tender_id, self.award_id, self.complaint_id, doc_id), {"data": {"description": "document description"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current (complete) tender status")


class TenderAwardContractResourceTest(BaseTenderWebTest):
Expand Down Expand Up @@ -908,12 +908,12 @@ def test_create_tender_award_contract(self):
self.tender_id, self.award_id), {'data': {'title': 'contract title', 'description': 'contract description', 'awardID': self.award_id}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't add contract in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't add contract in current (unsuccessful) tender status")

response = self.app.patch_json('/tenders/{}/awards/{}/contracts/{}'.format(self.tender_id, self.award_id, contract['id']), {"data": {"status": "active"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update contract in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update contract in current (unsuccessful) tender status")

def test_patch_tender_award_contract(self):
response = self.app.post_json('/tenders/{}/awards/{}/contracts'.format(
Expand Down Expand Up @@ -1231,7 +1231,7 @@ def test_create_tender_award_contract_document(self):
self.tender_id, self.award_id, self.contract_id), upload_files=[('file', 'name.doc', 'content')], status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't add document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't add document in current (unsuccessful) tender status")

def test_put_tender_award_contract_document(self):
response = self.app.post('/tenders/{}/awards/{}/contracts/{}/documents'.format(
Expand Down Expand Up @@ -1302,7 +1302,7 @@ def test_put_tender_award_contract_document(self):
self.tender_id, self.award_id, self.contract_id, doc_id), upload_files=[('file', 'name.doc', 'content3')], status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current (unsuccessful) tender status")

def test_patch_tender_award_contract_document(self):
response = self.app.post('/tenders/{}/awards/{}/contracts/{}/documents'.format(
Expand Down Expand Up @@ -1337,7 +1337,7 @@ def test_patch_tender_award_contract_document(self):
response = self.app.patch_json('/tenders/{}/awards/{}/contracts/{}/documents/{}'.format(self.tender_id, self.award_id, self.contract_id, doc_id), {"data": {"description": "document description"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current (unsuccessful) tender status")


class TenderAwardDocumentResourceTest(BaseTenderWebTest):
Expand Down Expand Up @@ -1507,7 +1507,7 @@ def test_create_tender_award_document(self):
self.tender_id, self.award_id), upload_files=[('file', 'name.doc', 'content')], status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't add document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't add document in current (complete) tender status")

def test_put_tender_award_document(self):
response = self.app.post('/tenders/{}/awards/{}/documents'.format(
Expand Down Expand Up @@ -1569,7 +1569,7 @@ def test_put_tender_award_document(self):
self.tender_id, self.award_id, doc_id), upload_files=[('file', 'name.doc', 'content3')], status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current (complete) tender status")

def test_patch_tender_award_document(self):
response = self.app.post('/tenders/{}/awards/{}/documents'.format(
Expand All @@ -1596,7 +1596,7 @@ def test_patch_tender_award_document(self):
response = self.app.patch_json('/tenders/{}/awards/{}/documents/{}'.format(self.tender_id, self.award_id, doc_id), {"data": {"description": "document description"}}, status=403)
self.assertEqual(response.status, '403 Forbidden')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current tender status")
self.assertEqual(response.json['errors'][0]["description"], "Can't update document in current (complete) tender status")


def suite():
Expand Down

0 comments on commit 0902558

Please sign in to comment.