From e69bb97476debf431faab73aceee114ccdf02899 Mon Sep 17 00:00:00 2001 From: annawzz Date: Fri, 3 Nov 2017 13:54:23 +0200 Subject: [PATCH 1/2] Add index to buildout.cfg --- buildout.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/buildout.cfg b/buildout.cfg index ee2900b0..69055b95 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -6,6 +6,7 @@ develop = . extensions = mr.developer auto-checkout = openprocurement.api openprocurement.tender.core openprocurement.tender.belowthreshold find-links = http://op:x9W3jZ@dist.quintagroup.com/op/ +index = https://pypi.python.org/simple [sources] openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git branch=production From 133e891b55bc68b7f2b4cfbc7f262bbb8854ec80 Mon Sep 17 00:00:00 2001 From: "dimon.obert" Date: Mon, 6 Nov 2017 12:15:08 +0200 Subject: [PATCH 2/2] add tests awarding with features --- .../tender/openua/tests/auction.py | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/openprocurement/tender/openua/tests/auction.py b/openprocurement/tender/openua/tests/auction.py index ca0a1fd0..54460261 100644 --- a/openprocurement/tender/openua/tests/auction.py +++ b/openprocurement/tender/openua/tests/auction.py @@ -21,6 +21,13 @@ patch_tender_lots_auction, # TenderFeaturesAuctionResourceTest get_tender_auction_feature, + post_tender_auction_feature, + # TenderFeaturesLotAuctionResourceTest + get_tender_lot_auction_features, + post_tender_lot_auction_features, + # TenderFeaturesMultilotAuctionResourceTest + get_tender_lots_auction_features, + post_tender_lots_auction_features ) from openprocurement.tender.openua.tests.base import ( @@ -70,7 +77,7 @@ class TenderMultipleLotAuctionResourceTest(TenderMultipleLotAuctionResourceTestM class TenderFeaturesAuctionResourceTest(BaseTenderUAContentWebTest): initial_data = test_features_tender_ua_data - initial_status = 'active.auction' + initial_status = 'active.tendering' initial_bids = [ { "parameters": [ @@ -110,7 +117,22 @@ class TenderFeaturesAuctionResourceTest(BaseTenderUAContentWebTest): } ] - test_get_tender_auction_features = snitch(get_tender_auction_feature) + test_get_tender_auction = snitch(get_tender_auction_feature) + test_post_tender_auction = snitch(post_tender_auction_feature) + + +class TenderFeaturesLotAuctionResourceTest(TenderLotAuctionResourceTestMixin, + TenderFeaturesAuctionResourceTest): + initial_lots = test_lots + test_get_tender_auction = snitch(get_tender_lot_auction_features) + test_post_tender_auction = snitch(post_tender_lot_auction_features) + + +class TenderFeaturesMultilotAuctionResourceTest(TenderMultipleLotAuctionResourceTestMixin, + TenderFeaturesAuctionResourceTest): + initial_lots = test_lots * 2 + test_get_tender_auction = snitch(get_tender_lots_auction_features) + test_post_tender_auction = snitch(post_tender_lots_auction_features) def suite(): @@ -118,6 +140,8 @@ def suite(): suite.addTest(unittest.makeSuite(TenderAuctionResourceTest)) suite.addTest(unittest.makeSuite(TenderSameValueAuctionResourceTest)) suite.addTest(unittest.makeSuite(TenderFeaturesAuctionResourceTest)) + suite.addTest(unittest.makeSuite(TenderFeaturesLotAuctionResourceTest)) + suite.addTest(unittest.makeSuite(TenderFeaturesMultilotAuctionResourceTest)) return suite