Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/production'
Browse files Browse the repository at this point in the history
  • Loading branch information
@vmaksymiv
vmaksymiv committed Jan 6, 2017
2 parents d1fff58 + 41cbb4c commit 2a539c7
Show file tree
Hide file tree
Showing 2 changed files with 56 additions and 18 deletions.
34 changes: 27 additions & 7 deletions openprocurement/tender/competitivedialogue/tests/stage1/tender.py
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
import unittest
from datetime import timedelta
from openprocurement.api.models import get_now, SANDBOX_MODE
from openprocurement.api.models import get_now, SANDBOX_MODE, CPV_ITEMS_CLASS_FROM
from openprocurement.api.utils import ROUTE_PREFIX
from openprocurement.api.tests.base import BaseWebTest, test_organization
from openprocurement.tender.competitivedialogue.models import CompetitiveDialogUA, CompetitiveDialogEU
Expand Down Expand Up @@ -507,14 +507,24 @@ def test_create_tender_invalid(self):

data = test_tender_data_eu["items"][0]["additionalClassifications"][0]["scheme"]
test_tender_data_eu["items"][0]["additionalClassifications"][0]["scheme"] = 'Не ДКПП'
if get_now() > CPV_ITEMS_CLASS_FROM:
cpv_code = test_tender_data_eu["items"][0]['classification']['id']
test_tender_data_eu["items"][0]['classification']['id'] = '99999999-9'
response = self.app.post_json(request_path, {'data': test_tender_data_eu}, status=422)
test_tender_data_eu["items"][0]["additionalClassifications"][0]["scheme"] = data
if get_now() > CPV_ITEMS_CLASS_FROM:
test_tender_data_eu["items"][0]['classification']['id'] = cpv_code
self.assertEqual(response.status, '422 Unprocessable Entity')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['status'], 'error')
self.assertEqual(response.json['errors'], [
{u'description': [{u'additionalClassifications': [u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}], u'location': u'body', u'name': u'items'}
])
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'location': u'body', u'name': u'items'}])
else:
self.assertEqual(response.json['errors'], [
{u'description': [{u'additionalClassifications': [u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}],
u'location': u'body', u'name': u'items'}])

data = test_tender_data_eu["procuringEntity"]["contactPoint"]["telephone"]
del test_tender_data_eu["procuringEntity"]["contactPoint"]["telephone"]
Expand Down Expand Up @@ -1819,14 +1829,24 @@ def test_create_tender_invalid(self):

data = test_tender_data_ua["items"][0]["additionalClassifications"][0]["scheme"]
test_tender_data_ua["items"][0]["additionalClassifications"][0]["scheme"] = 'Не ДКПП'
if get_now() > CPV_ITEMS_CLASS_FROM:
cpv_code = test_tender_data_ua["items"][0]['classification']['id']
test_tender_data_ua["items"][0]['classification']['id'] = '99999999-9'
response = self.app.post_json(request_path, {'data': test_tender_data_ua}, status=422)
test_tender_data_ua["items"][0]["additionalClassifications"][0]["scheme"] = data
if get_now() > CPV_ITEMS_CLASS_FROM:
test_tender_data_ua["items"][0]['classification']['id'] = cpv_code
self.assertEqual(response.status, '422 Unprocessable Entity')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['status'], 'error')
self.assertEqual(response.json['errors'], [
{u'description': [{u'additionalClassifications': [u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}], u'location': u'body', u'name': u'items'}
])
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'location': u'body', u'name': u'items'}])
else:
self.assertEqual(response.json['errors'], [{u'description': [{u'additionalClassifications': [
u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}],
u'location': u'body', u'name': u'items'}])

data = test_tender_data_ua["procuringEntity"]["contactPoint"]["telephone"]
del test_tender_data_ua["procuringEntity"]["contactPoint"]["telephone"]
Expand Down
40 changes: 29 additions & 11 deletions openprocurement/tender/competitivedialogue/tests/stage2/tender.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import resource
from nose.plugins.attrib import attr
from datetime import timedelta
from openprocurement.api.models import get_now, SANDBOX_MODE
from openprocurement.api.models import get_now, SANDBOX_MODE, CPV_ITEMS_CLASS_FROM
from openprocurement.api.utils import ROUTE_PREFIX, get_now
from openprocurement.api.tests.base import BaseWebTest, test_organization
from openprocurement.tender.competitivedialogue.models import (TenderStage2EU, TenderStage2UA, STAGE_2_UA_TYPE,
Expand Down Expand Up @@ -537,16 +537,26 @@ def test_create_tender_invalid(self):

data = test_tender_stage2_data_eu["items"][0]["additionalClassifications"][0]["scheme"]
test_tender_stage2_data_eu["items"][0]["additionalClassifications"][0]["scheme"] = 'Не ДКПП'
if get_now() > CPV_ITEMS_CLASS_FROM:
cpv_code = test_tender_stage2_data_eu["items"][0]['classification']['id']
test_tender_stage2_data_eu["items"][0]['classification']['id'] = '99999999-9'
response = self.app.post_json(request_path, {'data': test_tender_stage2_data_eu}, status=422)
test_tender_stage2_data_eu["items"][0]["additionalClassifications"][0]["scheme"] = data
if get_now() > CPV_ITEMS_CLASS_FROM:
test_tender_stage2_data_eu["items"][0]['classification']['id'] = cpv_code
self.assertEqual(response.status, '422 Unprocessable Entity')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['status'], 'error')
self.assertEqual(response.json['errors'], [
{u'description': [{u'additionalClassifications': [
u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}],
u'location': u'body', u'name': u'items'}
])
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'location': u'body', u'name': u'items'}])
else:
self.assertEqual(response.json['errors'], [
{u'description': [{u'additionalClassifications': [
u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}],
u'location': u'body', u'name': u'items'}])

data = test_tender_stage2_data_eu["procuringEntity"]["contactPoint"]["telephone"]
del test_tender_stage2_data_eu["procuringEntity"]["contactPoint"]["telephone"]
Expand Down Expand Up @@ -1735,16 +1745,24 @@ def test_create_tender_invalid(self):

data = test_tender_stage2_data_ua["items"][0]["additionalClassifications"][0]["scheme"]
test_tender_stage2_data_ua["items"][0]["additionalClassifications"][0]["scheme"] = 'Не ДКПП'
if get_now() > CPV_ITEMS_CLASS_FROM:
cpv_code = test_tender_stage2_data_ua["items"][0]['classification']['id']
test_tender_stage2_data_ua["items"][0]['classification']['id'] = '99999999-9'
response = self.app.post_json(request_path, {'data': test_tender_stage2_data_ua}, status=422)
test_tender_stage2_data_ua["items"][0]["additionalClassifications"][0]["scheme"] = data
if get_now() > CPV_ITEMS_CLASS_FROM:
test_tender_stage2_data_ua["items"][0]['classification']['id'] = cpv_code
self.assertEqual(response.status, '422 Unprocessable Entity')
self.assertEqual(response.content_type, 'application/json')
self.assertEqual(response.json['status'], 'error')
self.assertEqual(response.json['errors'], [
{u'description': [{u'additionalClassifications': [u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}],
u'location': u'body',
u'name': u'items'}
])
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'location': u'body', u'name': u'items'}])
else:
self.assertEqual(response.json['errors'], [{u'description': [{u'additionalClassifications': [
u"One of additional classifications should be one of [ДКПП, NONE, ДК003, ДК015, ДК018]."]}],
u'location': u'body', u'name': u'items'}])

data = test_tender_stage2_data_ua["procuringEntity"]["contactPoint"]["telephone"]
del test_tender_stage2_data_ua["procuringEntity"]["contactPoint"]["telephone"]
Expand Down

0 comments on commit 2a539c7

Please sign in to comment.