Skip to content

Commit

Permalink
Merge pull request #13 from kukirokuk/a204388103819339_transfer_compa…
Browse files Browse the repository at this point in the history
…titive_dialogue_stage1

Add relocation for 1 stage of competitive dialogue and tests
  • Loading branch information
vmaksymiv committed Feb 1, 2017
2 parents bd16d29 + 6f98af3 commit e631f08
Show file tree
Hide file tree
Showing 5 changed files with 124 additions and 2 deletions.
28 changes: 27 additions & 1 deletion openprocurement/relocation/api/tests/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
test_tender_negotiation_data,
test_tender_negotiation_quick_data)
from openprocurement.contracting.api.tests.base import test_contract_data, test_tender_token

from openprocurement.tender.competitivedialogue.tests.base import(test_tender_data_eu as test_tender_data_competitive_eu,
test_tender_data_ua as test_tender_data_competitive_ua,
)
from openprocurement.tender.competitivedialogue.tests.base import author
from openprocurement.tender.competitivedialogue.tests.base import BaseCompetitiveDialogWebTest
test_transfer_data = {}

test_bid_data = {'data': {'tenderers': [test_organization], "value": {"amount": 500}}}
Expand Down Expand Up @@ -265,3 +269,25 @@ def create_contract(self):
# self.contract_token = response.json['access']['token']
self.contract_id = self.contract['id']
self.app.authorization = orig_auth


class CompatitiveDialogueOwnershipWebTest(BaseWebTest, BaseCompetitiveDialogWebTest):

def setUp(self):
super(CompatitiveDialogueOwnershipWebTest, self).setUp()
self.create_tender()

def create_tender(self):
self.app.authorization = ('Basic', ('competitive_dialogue', ''))
response = self.app.post_json('/tenders', {"data": self.initial_data})
self.assertEqual(response.status, '201 Created')
self.assertEqual(response.content_type, 'application/json')
self.assertIn('transfer', response.json['access'])
self.assertNotIn('transfer_token', response.json['data'])
tender = response.json['data']
self.tender_token = response.json['access']['token']
self.tender_transfer = response.json['access']['transfer']
self.tender_id = tender['id']
tender_set = set(tender)
self.set_status('draft.stage2')
self.app.authorization = ('Basic', (self.first_owner, ''))
34 changes: 34 additions & 0 deletions openprocurement/relocation/api/tests/bid.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
test_ua_tender_data,
test_uadefense_tender_data,
test_eu_tender_data,
test_tender_data_competitive_ua,
test_tender_data_competitive_eu,
test_transfer_data)
from openprocurement.relocation.api.tests.base import (
test_bid_data,
Expand Down Expand Up @@ -122,6 +124,38 @@ def test_change_bid_ownership(self):
super(OpenUADefenseBidOwnershipChangeTest, self).test_change_bid_ownership()


class OpenUACompatitiveDialogueBidOwnershipChangeTest(OpenUAOwnershipWebTest, BidOwnershipChangeTest):
tender_type = "competitiveDialogueUA"
initial_data = test_tender_data_competitive_ua
initial_bid = test_ua_bid_data
first_owner = 'broker'
second_owner = 'broker3'
test_owner = 'broker3t'
invalid_owner = 'broker1'
first_provider = 'broker'
second_provider = 'broker4'
invalid_provider = 'broker2'

def test_change_bid_ownership(self):
super(OpenUACompatitiveDialogueBidOwnershipChangeTest, self).test_change_bid_ownership()


class OpenEUCompatitiveDialogueBidOwnershipChangeTest(OpenEUOwnershipWebTest, BidOwnershipChangeTest):
tender_type = "competitiveDialogueEU"
initial_data = test_tender_data_competitive_ua
initial_bid = test_eu_bid_data
first_owner = 'broker'
second_owner = 'broker3'
test_owner = 'broker3t'
invalid_owner = 'broker1'
first_provider = 'broker'
second_provider = 'broker4'
invalid_provider = 'broker2'

def test_change_bid_ownership(self):
super(OpenEUCompatitiveDialogueBidOwnershipChangeTest, self).test_change_bid_ownership()


class OpenEUBidOwnershipChangeTest(OpenEUOwnershipWebTest, BidOwnershipChangeTest):
tender_type = "aboveThresholdEU"
initial_data = test_eu_tender_data
Expand Down
34 changes: 34 additions & 0 deletions openprocurement/relocation/api/tests/complaint.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
test_ua_tender_data,
test_uadefense_tender_data,
test_eu_tender_data,
test_tender_data_competitive_ua,
test_tender_data_competitive_eu,
test_transfer_data)
from openprocurement.relocation.api.tests.base import (
test_bid_data,
Expand Down Expand Up @@ -138,6 +140,38 @@ def test_change_complaint_ownership(self):
super(OpenUADefenseComplaintOwnershipChangeTest, self).test_change_complaint_ownership()


class OpenUACompetitiveDialogueComplaintOwnershipChangeTest(OpenUAOwnershipWebTest, ComplaintOwnershipChangeTest):
tender_type = "competitiveDialogueUA"
initial_data = test_tender_data_competitive_ua
initial_bid = test_bid_data
first_owner = 'broker'
owner2 = 'broker3'
test_owner = 'broker3t'
invalid_owner = 'broker1'
First_provider = 'broker'
second_provider = 'broker4'
invalid_provider = 'broker2'

def test_change_complaint_ownership(self):
super(OpenUACompetitiveDialogueComplaintOwnershipChangeTest, self).test_change_complaint_ownership()


class OpenEUCompetitiveDialogueComplaintOwnershipChangeTest(OpenEUOwnershipWebTest, ComplaintOwnershipChangeTest):
tender_type = "competitiveDialogueEU"
initial_data = test_eu_tender_data
initial_bid = test_eu_bid_data
first_owner = 'broker'
owner2 = 'broker3'
test_owner = 'broker3t'
invalid_owner = 'broker1'
First_provider = 'broker'
second_provider = 'broker4'
invalid_provider = 'broker2'

def test_change_complaint_ownership(self):
super(OpenEUCompetitiveDialogueComplaintOwnershipChangeTest, self).test_change_complaint_ownership()


class OpenEUComplaintOwnershipChangeTest(OpenEUOwnershipWebTest, ComplaintOwnershipChangeTest):
tender_type = "aboveThresholdEU"
initial_data = test_eu_tender_data
Expand Down
29 changes: 28 additions & 1 deletion openprocurement/relocation/api/tests/tender.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# -*- coding: utf-8 -*-
import unittest

from openprocurement.relocation.api.tests.base import OwnershipWebTest, OpenUAOwnershipWebTest, OpenEUOwnershipWebTest
from openprocurement.relocation.api.tests.base import (OwnershipWebTest, OpenUAOwnershipWebTest,
OpenEUOwnershipWebTest,
CompatitiveDialogueOwnershipWebTest)
from openprocurement.relocation.api.tests.base import (
test_tender_data,
test_ua_tender_data,
Expand All @@ -10,6 +12,8 @@
test_tender_reporting_data,
test_tender_negotiation_data,
test_tender_negotiation_quick_data,
test_tender_data_competitive_ua,
test_tender_data_competitive_eu,
test_transfer_data)


Expand Down Expand Up @@ -186,6 +190,29 @@ def test_change_tender_ownership(self):
super(OpenUADefenseTenderOwnershipChangeTest, self).test_change_tender_ownership()


class OpenUACompatitiveTenderOwnershipChangeTest(OpenUAOwnershipWebTest, TenderOwnershipChangeTest):
tender_type = "competitiveDialogueUA"
initial_data = test_tender_data_competitive_ua
first_owner = 'broker'
second_owner = 'broker3'
test_owner = 'broker3t'
invalid_owner = 'broker1'
def test_change_tender_ownership(self):
super(OpenUACompatitiveTenderOwnershipChangeTest, self).test_change_tender_ownership()


class OpenEUCompatitiveTenderOwnershipChangeTest(OpenEUOwnershipWebTest, TenderOwnershipChangeTest):
tender_type = "competitiveDialogueEU"
initial_data = test_tender_data_competitive_eu
first_owner = 'broker'
second_owner = 'broker3'
test_owner = 'broker3t'
invalid_owner = 'broker1'

def test_change_tender_ownership(self):
super(OpenEUCompatitiveTenderOwnershipChangeTest, self).test_change_tender_ownership()


class OpenEUTenderOwnershipChangeTest(OpenEUOwnershipWebTest, TenderOwnershipChangeTest):
tender_type = "aboveThresholdEU"
initial_data = test_eu_tender_data
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
'openprocurement.tender.openeu',
'openprocurement.tender.limited',
'openprocurement.contracting.api',
'openprocurement.tender.competitivedialogue',
]

docs_requires = requires + [
Expand Down

0 comments on commit e631f08

Please sign in to comment.