Merge remote-tracking branch 'origin/a246404800934002_special_items'

openprocurement · Jan 24, 2017 · 22edda6 · 22edda6
2 parents 1c97fa9 + 0ae91c0
commit 22edda6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/openprocurement/tender/competitivedialogue/tests/stage1/tender.py b/openprocurement/tender/competitivedialogue/tests/stage1/tender.py
@@ -519,7 +519,7 @@ def test_create_tender_invalid(self):
         self.assertEqual(response.json['status'], 'error')
         if get_now() > CPV_ITEMS_CLASS_FROM:
             self.assertEqual(response.json['errors'], [
-                {u'description': [{u'additionalClassifications': [u"One of additional classifications should be one of [ДК003, ДК015, ДК018]."]}],
+                {u'description': [{u'additionalClassifications': [u"One of additional classifications should be one of [ДК003, ДК015, ДК018, specialNorms]."]}],
                                   u'location': u'body', u'name': u'items'}])
         else:
             self.assertEqual(response.json['errors'], [
@@ -1841,7 +1841,7 @@ def test_create_tender_invalid(self):
         self.assertEqual(response.json['status'], 'error')
         if get_now() > CPV_ITEMS_CLASS_FROM:
             self.assertEqual(response.json['errors'], [{u'description': [{u'additionalClassifications': [
-                    u"One of additional classifications should be one of [ДК003, ДК015, ДК018]."]}],
+                    u"One of additional classifications should be one of [ДК003, ДК015, ДК018, specialNorms]."]}],
                                   u'location': u'body', u'name': u'items'}])
         else:
             self.assertEqual(response.json['errors'], [{u'description': [{u'additionalClassifications': [

diff --git a/openprocurement/tender/competitivedialogue/tests/stage2/bid.py b/openprocurement/tender/competitivedialogue/tests/stage2/bid.py
@@ -1239,11 +1239,13 @@ def setUp(self):
         test_bid_1['tenderers'] = [author]
         test_bid_2 = deepcopy(test_bids[1])
         test_bid_2['tenderers'] = [author]
+        print 0, self.app.authorization
         response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), {'data': test_bid_1})
         bid = response.json['data']
         self.bid_id = bid['id']
         self.bid_token = response.json['access']['token']
         # create second bid
+        print 1, self.app.authorization
         response = self.app.post_json('/tenders/{}/bids'.format(self.tender_id), {'data': test_bid_2})
         bid2 = response.json['data']
         self.bid2_id = bid2['id']
@@ -1428,6 +1430,7 @@ def all_documents_are_accessible_for_bid_owner(resource):
             orig_auth = self.app.authorization
             self.app.authorization = ('Basic', ('broker', ''))
             for resource in ['documents', 'financial_documents', 'eligibility_documents', 'qualification_documents']:
+                print 2, self.app.authorization
                 response = self.app.get('/tenders/{}/bids/{}/{}?acc_token={}'.format(self.tender_id, self.bid_id,
                                                                                      resource, self.bid_token))
                 self.assertEqual(response.status, '200 OK')

diff --git a/openprocurement/tender/competitivedialogue/tests/stage2/tender.py b/openprocurement/tender/competitivedialogue/tests/stage2/tender.py
@@ -550,7 +550,7 @@ def test_create_tender_invalid(self):
         if get_now() > CPV_ITEMS_CLASS_FROM:
             self.assertEqual(response.json['errors'], [
                 {u'description': [{u'additionalClassifications': [
-                    u"One of additional classifications should be one of [ДК003, ДК015, ДК018]."]}],
+                    u"One of additional classifications should be one of [ДК003, ДК015, ДК018, specialNorms]."]}],
                     u'location': u'body', u'name': u'items'}])
         else:
             self.assertEqual(response.json['errors'], [
@@ -1757,7 +1757,7 @@ def test_create_tender_invalid(self):
         self.assertEqual(response.json['status'], 'error')
         if get_now() > CPV_ITEMS_CLASS_FROM:
             self.assertEqual(response.json['errors'], [{u'description': [{u'additionalClassifications': [
-                    u"One of additional classifications should be one of [ДК003, ДК015, ДК018]."]}],
+                    u"One of additional classifications should be one of [ДК003, ДК015, ДК018, specialNorms]."]}],
                     u'location': u'body', u'name': u'items'}])
         else:
             self.assertEqual(response.json['errors'], [{u'description': [{u'additionalClassifications': [