From 22d39e50cb00f2a9e36d91890c5a52974ff6b84f Mon Sep 17 00:00:00 2001 From: Krokop <chezar1995@gmail.com> Date: Mon, 19 Sep 2016 11:42:33 +0300 Subject: [PATCH] make more clear --- op_robot_tests/tests_files/service_keywords.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/op_robot_tests/tests_files/service_keywords.py b/op_robot_tests/tests_files/service_keywords.py index 09782a0..c8d89e7 100644 --- a/op_robot_tests/tests_files/service_keywords.py +++ b/op_robot_tests/tests_files/service_keywords.py @@ -443,7 +443,7 @@ def get_complaint_index_by_complaintID(data, complaintID): def generate_test_bid_data(tender_data): bid = test_bid_data() - if 'aboveThreshold' in tender_data.get('procurementMethodType', '') or 'competitiveDialogue' in tender_data.get('procurementMethodType', ''): + if tender_data.get('procurementMethodType', '')[:-2] in ('aboveThreshold', 'competitiveDialogue'): bid.data.selfEligible = True bid.data.selfQualified = True if 'lots' in tender_data: @@ -476,7 +476,7 @@ def generate_test_bid_data_second_stage(tender_data, index='0'): bid['data']['tenderers'][0]['identifier']['scheme'] = tender_data['shortlistedFirms'][index]['identifier']['scheme'] bid['data']['tenderers'][0]['identifier']['legalName'] = tender_data['shortlistedFirms'][index]['identifier']['legalName'] - if 'aboveThreshold' in tender_data.get('procurementMethodType', '') or 'competitiveDialogue' in tender_data.get('procurementMethodType', ''): + if tender_data.get('procurementMethodType', '')[:-2] in ('aboveThreshold', 'competitiveDialogue'): bid.data.selfEligible = True bid.data.selfQualified = True if 'lots' in tender_data: -- libgit2 0.24.0