Add accelerator to all procedure

@@ -25,11 +25,12 @@ Default:
             # Second number in list: Duration of period (for endDate)
             # Second number in list: Duration of period (for endDate)
             enquiry: [0, 11]
             enquiry: [0, 11]
             tender:  [0, 31]
             tender:  [0, 31]
-        openua:
             # accelerator: Integer value
             # accelerator: Integer value
             # This is not a name of period
             # This is not a name of period
             # Please refer to API documentation to find out what's this
             # Please refer to API documentation to find out what's this
             accelerator: 1440
             accelerator: 1440
+        openua:
+            accelerator: 1440
             tender:  [0, 15]
             tender:  [0, 15]
             # Please remember that openUA and openEU procedures
             # Please remember that openUA and openEU procedures
             # forbid anyone to set or modify enquiryPeriod
             # forbid anyone to set or modify enquiryPeriod

@@ -72,6 +72,9 @@ def test_tender_data(params, periods=("enquiry", "tender")):
         "items": [],
         "items": [],
         "features": []
         "features": []
     }
     }
+    accelerator = params['intervals']['accelerator']
+    data['procurementMethodDetails'] = 'quick, ' \
+        'accelerator={}'.format(accelerator)
     data["procuringEntity"]["kind"] = "other"
     data["procuringEntity"]["kind"] = "other"
     if data.get("mode") == "test":
     if data.get("mode") == "test":
         data["title"] = u"[ТЕСТУВАННЯ] {}".format(data["title"])
         data["title"] = u"[ТЕСТУВАННЯ] {}".format(data["title"])
@@ -144,14 +147,12 @@ def test_tender_data_limited(params):
             "stateLegalServices"
             "stateLegalServices"
         )
         )
         cause = fake.random_element(cause_variants)
         cause = fake.random_element(cause_variants)
-        data.update({"cause": cause})
-    if params['mode'] == "negotiation.quick":
+    elif params['mode'] == "negotiation.quick":
         cause_variants = ('quick',)
         cause_variants = ('quick',)
-        cause = fake.random_element(cause_variants)
-        data.update({"cause": cause})
     if params['mode'] in ("negotiation", "negotiation.quick"):
     if params['mode'] in ("negotiation", "negotiation.quick"):
+        cause = fake.random_element(cause_variants)
         data.update({
         data.update({
-            "procurementMethodDetails": "quick, accelerator=1440",
+            "cause": cause,
             "causeDescription": fake.description()
             "causeDescription": fake.description()
         })
         })
     return munchify(data)
     return munchify(data)
@@ -350,33 +351,21 @@ def test_lot_document_data(document, lot_id):
 
 
 
 
 def test_tender_data_openua(params):
 def test_tender_data_openua(params):
-    accelerator = params['intervals']['accelerator']
-    # Since `accelerator` field is not really a list containing timings
-    # for a period called `acceleratorPeriod`, let's remove it :)
-    del params['intervals']['accelerator']
     # We should not provide any values for `enquiryPeriod` when creating
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
     data = test_tender_data(params, ('tender',))
     data = test_tender_data(params, ('tender',))
     data['procurementMethodType'] = 'aboveThresholdUA'
     data['procurementMethodType'] = 'aboveThresholdUA'
-    data['procurementMethodDetails'] = 'quick, ' \
-        'accelerator={}'.format(accelerator)
     data['procuringEntity']['kind'] = 'general'
     data['procuringEntity']['kind'] = 'general'
     return data
     return data
 
 
 
 
 def test_tender_data_openeu(params):
 def test_tender_data_openeu(params):
-    accelerator = params['intervals']['accelerator']
-    # Since `accelerator` field is not really a list containing timings
-    # for a period called `acceleratorPeriod`, let's remove it :)
-    del params['intervals']['accelerator']
     # We should not provide any values for `enquiryPeriod` when creating
     # We should not provide any values for `enquiryPeriod` when creating
     # an openUA or openEU procedure. That field should not be present at all.
     # an openUA or openEU procedure. That field should not be present at all.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
     # Therefore, we pass a nondefault list of periods to `test_tender_data()`.
     data = test_tender_data(params, ('tender',))
     data = test_tender_data(params, ('tender',))
     data['procurementMethodType'] = 'aboveThresholdEU'
     data['procurementMethodType'] = 'aboveThresholdEU'
-    data['procurementMethodDetails'] = 'quick, ' \
-        'accelerator={}'.format(accelerator)
     data['title_en'] = "[TESTING]"
     data['title_en'] = "[TESTING]"
     for item_number, item in enumerate(data['items']):
     for item_number, item in enumerate(data['items']):
         item['description_en'] = "Test item #{}".format(item_number)
         item['description_en'] = "Test item #{}".format(item_number)

@@ -272,16 +272,11 @@ def prepare_test_tender_data(procedure_intervals, tender_parameters):
     tender_parameters['intervals'] = intervals
     tender_parameters['intervals'] = intervals
 
 
     # Set acceleration value for certain modes
     # Set acceleration value for certain modes
-    if mode in ['openua', 'openeu']:
-        assert isinstance(intervals['accelerator'], int), \
-            "Accelerator should be an 'int', " \
-            "not '{}'".format(type(intervals['accelerator']).__name__)
-        assert intervals['accelerator'] >= 0, \
-            "Accelerator should not be less than 0"
-    else:
-        assert 'accelerator' not in intervals.keys(), \
-               "Accelerator is not available for mode '{0}'".format(mode)
-
+    assert isinstance(intervals['accelerator'], int), \
+        "Accelerator should be an 'int', " \
+        "not '{}'".format(type(intervals['accelerator']).__name__)
+    assert intervals['accelerator'] >= 0, \
+        "Accelerator should not be less than 0"
     if mode == 'negotiation':
     if mode == 'negotiation':
         return munchify({'data': test_tender_data_limited(tender_parameters)})
         return munchify({'data': test_tender_data_limited(tender_parameters)})
     elif mode == 'negotiation.quick':
     elif mode == 'negotiation.quick':