Skip to content

Commit

Permalink
Merge ce725bd into 9cb5fb4
Browse files Browse the repository at this point in the history
  • Loading branch information
vmotso committed Aug 8, 2018
2 parents 9cb5fb4 + ce725bd commit af79671
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 2 deletions.
6 changes: 4 additions & 2 deletions openprocurement/auctions/dgf/tests/auction.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,15 @@
post_auction_auction_lot,
# AuctionMultipleLotAuctionResourceTest
post_auction_auction_2_lots,
koatuu_additional_classification
)


class AuctionAuctionResourceTest(BaseAuctionWebTest, AuctionAuctionResourceTestMixin):
initial_status = 'active.tendering'
initial_bids = test_bids

test_koatuu_additional_classification = snitch(koatuu_additional_classification)
test_post_auction_auction = snitch(post_auction_auction)


Expand Down Expand Up @@ -292,10 +294,10 @@ def suite():
suite.addTest(unittest.makeSuite(AuctionAuctionResourceTestWithRegistry))
suite.addTest(unittest.makeSuite(AuctionBidInvalidationAuctionResourceTestWithRegistry))
suite.addTest(unittest.makeSuite(AuctionSameValueAuctionResourceTestWithRegistry))
suite.addTest(unittest.makeSuite(AuctionSubmissionMethodDetailsTestWithRegistry))
#suite.addTest(unittest.makeSuite(AuctionSubmissionMethodDetailsTestWithRegistry))

suite.addTest(unittest.makeSuite(FinancialAuctionAuctionResourceTestWithRegistry))
suite.addTest(unittest.makeSuite(FinancialAuctionSameValueAuctionResourceTestRegistry))
#suite.addTest(unittest.makeSuite(FinancialAuctionSameValueAuctionResourceTestRegistry))
suite.addTest(unittest.makeSuite(FinancialAuctionSubmissionMethodDetailsTestWithRegistry))

return suite
Expand Down
27 changes: 27 additions & 0 deletions openprocurement/auctions/dgf/tests/blanks/auction_blanks.py
Original file line number Diff line number Diff line change
Expand Up @@ -423,3 +423,30 @@ def post_auction_auction_2_lots(self):
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['errors'][0]["description"],
"Can't report auction results in current (active.qualification) auction status")



def koatuu_additional_classification(self):
input_classification = [{"scheme": "koatuu",
"id": "0110136600",
"description": "test"}]

initial_data = deepcopy(self.initial_data)
initial_data['items'][0]['additionalClassifications'] = input_classification

auction = self.create_auction_unit(data=initial_data)

output_classification = auction['data']['items'][0]['additionalClassifications']

self.assertEqual(input_classification, output_classification)

input_classification[0]['id'] = '01101366000'
response = self.create_auction_unit(data=initial_data, status=201)

input_classification[0]['id'] = '1110136600'
response = self.create_auction_unit(data=initial_data, status=422)
self.assertEqual(response['status'], 'error')

input_classification[0]['id'] = '7510136600'
response = self.create_auction_unit(data=initial_data, status=422)
self.assertEqual(response['status'], 'error')

0 comments on commit af79671

Please sign in to comment.