diff --git a/openprocurement/auctions/dgf/tests/app_meta.yaml b/openprocurement/auctions/dgf/tests/app_meta.yaml deleted file mode 100644 index 9c56378f..00000000 --- a/openprocurement/auctions/dgf/tests/app_meta.yaml +++ /dev/null @@ -1,32 +0,0 @@ ---- -plugins: - api: - plugins: - transferring: - plugins: - auctions.transferring: - auctions.core: - plugins: - auctions.dgf.financial: - plugins: - dgf.financial.migration: - aliases: [] - use_default: true - migration: false - auctions.dgf.other: - plugins: - dgf.other.migration: - aliases: [] - use_default: true - migration: false -config: - auth: - type: file - src: auth.ini - db: - type: couchdb - db_name: test - url: localhost:5984 - writer: - name: op - password: op diff --git a/openprocurement/auctions/dgf/tests/auth.ini b/openprocurement/auctions/dgf/tests/auth.ini deleted file mode 100644 index 22a93f07..00000000 --- a/openprocurement/auctions/dgf/tests/auth.ini +++ /dev/null @@ -1,31 +0,0 @@ -[auction] -auction = auction - -[chronograph] -chronograph = chronograph - -[Administrator] -administrator = administrator - -[tests] -chrisr = chrisr - -[brokers] -broker = broker -broker05 = broker05 -broker1 = broker1,1 -broker2 = broker2,2 -broker3 = broker3,3 -broker4 = broker4,4 -broker1t = broker1t,1t -broker2t = broker2t,2t - -[reviewers] -reviewer = reviewer - -[admins] -test = token - - -[convoy] -convoy = convoy \ No newline at end of file diff --git a/openprocurement/auctions/dgf/tests/base.py b/openprocurement/auctions/dgf/tests/base.py index ec091844..6515e983 100644 --- a/openprocurement/auctions/dgf/tests/base.py +++ b/openprocurement/auctions/dgf/tests/base.py @@ -20,6 +20,11 @@ DEFAULT_PROCUREMENT_METHOD_TYPE_FINANCIAL ) +from openprocurement.auctions.dgf.tests.fixtures import PARTIAL_MOCK_CONFIG +from openprocurement.auctions.core.tests.base import MOCK_CONFIG as BASE_MOCK_CONFIG +from openprocurement.auctions.core.utils import connection_mock_config + + now = datetime.now() test_auction_data['procurementMethodType'] = DEFAULT_PROCUREMENT_METHOD_TYPE_OTHER if SANDBOX_MODE: @@ -161,6 +166,12 @@ test_financial_auction_data_with_schema['items'][0]['schema_properties'] = schema_properties +MOCK_CONFIG = connection_mock_config(PARTIAL_MOCK_CONFIG, + base=BASE_MOCK_CONFIG, + connector=('plugins', 'api', 'plugins', + 'auctions.core', 'plugins')) + + class BaseWebTest(CoreBaseWebTest): """Base Web Test to test openprocurement.auctions.dgf. @@ -169,6 +180,7 @@ class BaseWebTest(CoreBaseWebTest): """ relative_to = os.path.dirname(__file__) + mock_config = MOCK_CONFIG class BaseAuctionWebTest(CoreBaseAuctionWebTest): @@ -176,6 +188,7 @@ class BaseAuctionWebTest(CoreBaseAuctionWebTest): initial_data = test_auction_data initial_organization = test_organization registry = False + mock_config = MOCK_CONFIG def create_auction(self): data = deepcopy(self.initial_data) @@ -198,8 +211,7 @@ def create_auction(self): self.auction_id = auction['id'] authorization = self.app.authorization self.app.authorization = ('Basic', ('convoy', '')) - response = self.app.patch_json('/auctions/{}'.format(self.auction_id), - {'data': {'items': items, 'status': 'active.tendering'}}) + response = self.app.patch_json('/auctions/{}'.format(self.auction_id), {'data': {'items': items, 'status': 'active.tendering'}}) self.assertEqual(response.status, '200 OK') self.assertEqual(response.content_type, 'application/json') auction = response.json['data'] diff --git a/openprocurement/auctions/dgf/tests/fixtures.py b/openprocurement/auctions/dgf/tests/fixtures.py index 74b930a4..f808dfb6 100644 --- a/openprocurement/auctions/dgf/tests/fixtures.py +++ b/openprocurement/auctions/dgf/tests/fixtures.py @@ -5,6 +5,25 @@ ) from openprocurement.auctions.core.utils import get_now +PARTIAL_MOCK_CONFIG = { + "auctions.dgf.financial":{ + "use_default":True, + "plugins":{ + "dgf.financial.migration":None + }, + "migration":False, + "aliases":[] + }, + "auctions.dgf.other":{ + "use_default":True, + "plugins":{ + "dgf.other.migration":None + }, + "migration":False, + "aliases":[] + } +} + PROLONGATION = { 'decisionID': 'very_importante_documente', 'description': 'Prolongate your contract for free!',