Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Disable require additionalClassification for classification.id == 999… #82

Merged
merged 1 commit into from Mar 14, 2018
Merged

Disable require additionalClassification for classification.id == 999… #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions buildout.cfg
View file
Open in desktop
Expand Up @@ -10,10 +10,10 @@ index = https://pypi.python.org/simple

[sources]
openprocurement.api = git https://github.com/openprocurement/openprocurement.api.git branch=production
openprocurement.tender.core = git https://github.com/openprocurement/openprocurement.tender.core.git branch=production
openprocurement.tender.openeu = git https://github.com/openprocurement/openprocurement.tender.openeu.git branch=production
openprocurement.tender.openua = git https://github.com/openprocurement/openprocurement.tender.openua.git branch=production
openprocurement.tender.belowthreshold = git https://github.com/openprocurement/openprocurement.tender.belowthreshold.git branch=production
openprocurement.tender.core = git https://github.com/openprocurement/openprocurement.tender.core.git branch=a563879808284502_disable_999999-9_additional_classification_required
openprocurement.tender.openeu = git https://github.com/openprocurement/openprocurement.tender.openeu.git branch=a563879808284502_disable_999999-9_additional_classification_required
openprocurement.tender.openua = git https://github.com/openprocurement/openprocurement.tender.openua.git branch=a563879808284502_disable_999999-9_additional_classification_required
openprocurement.tender.belowthreshold = git https://github.com/openprocurement/openprocurement.tender.belowthreshold.git branch=a563879808284502_disable_999999-9_additional_classification_required

[test]
recipe = zc.recipe.egg:scripts
Expand Down
25 changes: 17 additions & 8 deletions openprocurement/tender/esco/tests/tender_blanks.py
View file
Open in desktop
Expand Up @@ -5,6 +5,10 @@
from openprocurement.api.constants import CPV_ITEMS_CLASS_FROM
from openprocurement.api.utils import get_now

from openprocurement.tender.core.constants import (
NOT_REQUIRED_ADDITIONAL_CLASSIFICATION_FROM
)

from openprocurement.tender.esco.models import TenderESCO


Expand Down Expand Up @@ -678,17 +682,22 @@ def create_tender_invalid(self):
if get_now() > CPV_ITEMS_CLASS_FROM:
cpv_code = self.initial_data["items"][0]['classification']['id']
self.initial_data["items"][0]['classification']['id'] = '99999999-9'
response = self.app.post_json(request_path, {'data': self.initial_data}, status=422)
status = 422 if get_now() < NOT_REQUIRED_ADDITIONAL_CLASSIFICATION_FROM else 201
response = self.app.post_json(request_path, {'data': self.initial_data}, status=status)
self.initial_data["items"][0]["additionalClassifications"] = data
if get_now() > CPV_ITEMS_CLASS_FROM:
self.initial_data["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'This field is required.']}],
u'location': u'body', u'name': u'items'}
])
if status == 201:
self.assertEqual(response.status, '201 Created')
self.assertEqual(response.content_type, 'application/json')
else:
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'This field is required.']}],
u'location': u'body', u'name': u'items'}
])

data = self.initial_data["items"][0]["additionalClassifications"][0]["scheme"]
self.initial_data["items"][0]["additionalClassifications"][0]["scheme"] = 'Не ДКПП'
Expand Down