diff --git a/cucumber.js b/cucumber.js index 5390a9215..10dcd79b4 100644 --- a/cucumber.js +++ b/cucumber.js @@ -3,5 +3,5 @@ module.exports = { verify: '--strict --tags ~@stress --tags ~@todo -f progress --require features/support --require features/step_definitions', todo: '--strict --tags @todo --require features/support --require features/step_definitions', all: '--strict --require features/support --require features/step_definitions', - mld: '--strict --tags ~@stress --tags ~@todo --tags ~@match --tags ~@alternative --tags ~@traffic --tags ~@weight --tags ~@matrix --tags ~@trip --tags ~@via --require features/support --require features/step_definitions -f progress' + mld: '--strict --tags ~@stress --tags ~@todo --tags ~@match --tags ~@alternative --tags ~@matrix --tags ~@trip --tags ~@via --require features/support --require features/step_definitions -f progress' } diff --git a/features/car/traffic_turn_penalties.feature b/features/car/traffic_turn_penalties.feature index 7fcbe197e..21644a2ea 100644 --- a/features/car/traffic_turn_penalties.feature +++ b/features/car/traffic_turn_penalties.feature @@ -87,6 +87,7 @@ Feature: Traffic - turn penalties # hkl left turn # ade left turn And the contract extra arguments "--turn-penalty-file {penalties_file}" + And the customize extra arguments "--turn-penalty-file {penalties_file}" When I route I should get | from | to | route | speed | weight | time | | a | h | ad,dhk | 65 km/h | 11 | 11s +-1 | @@ -109,8 +110,9 @@ Feature: Traffic - turn penalties # double left - hdc penalty ever so slightly higher than imn; forces all the way around Scenario: Too-negative penalty clamps, but does not fail - Given the contract extra arguments "--turn-penalty-file {penalties_file}" - And the profile "testbot" + Given the profile "testbot" + And the contract extra arguments "--turn-penalty-file {penalties_file}" + And the customize extra arguments "--turn-penalty-file {penalties_file}" And the turn penalty file """ 1,4,5,-10 diff --git a/features/car/weight.feature b/features/car/weight.feature index 5ca4e205e..d47569d7e 100644 --- a/features/car/weight.feature +++ b/features/car/weight.feature @@ -53,6 +53,7 @@ Feature: Car - weights | ec | service | yes | And the extract extra arguments "--generate-edge-lookup" And the contract extra arguments "--segment-speed-file {speeds_file}" + And the customize extra arguments "--segment-speed-file {speeds_file}" And the speed file """ 2,5,8 diff --git a/features/testbot/matching.feature b/features/testbot/matching.feature index 8d25be275..2fc4f8fa2 100644 --- a/features/testbot/matching.feature +++ b/features/testbot/matching.feature @@ -139,6 +139,7 @@ Feature: Basic Map Matching """ And the contract extra arguments "--segment-speed-file {speeds_file}" + And the customize extra arguments "--segment-speed-file {speeds_file}" When I match I should get | trace | matchings | a:duration | @@ -165,6 +166,7 @@ Feature: Basic Map Matching """ And the contract extra arguments "--segment-speed-file {speeds_file}" + And the customize extra arguments "--segment-speed-file {speeds_file}" When I match I should get | trace | matchings | a:duration | diff --git a/features/testbot/traffic_speeds.feature b/features/testbot/traffic_speeds.feature index 16f2b3b6a..02ceb1797 100644 --- a/features/testbot/traffic_speeds.feature +++ b/features/testbot/traffic_speeds.feature @@ -27,7 +27,8 @@ Feature: Traffic - speeds Scenario: Weighting based on speed file Given the contract extra arguments "--segment-speed-file {speeds_file}" - Given the speed file + And the customize extra arguments "--segment-speed-file {speeds_file}" + And the speed file """ 1,2,0 2,1,0 @@ -52,7 +53,8 @@ Feature: Traffic - speeds Scenario: Weighting based on speed file weights, ETA based on file durations Given the contract extra arguments "--segment-speed-file {speeds_file}" - Given the speed file + And the customize extra arguments "--segment-speed-file {speeds_file}" + And the speed file """ 1,2,1,20020.7 2,1,1,20020.7 @@ -84,7 +86,8 @@ Feature: Traffic - speeds properties.weight_precision = 3 """ And the contract extra arguments "--segment-speed-file {speeds_file}" - Given the speed file + And the customize extra arguments "--segment-speed-file {speeds_file}" + And the speed file """ 1,2,1,20020.789 2,1,1,20020.123 @@ -110,10 +113,11 @@ Feature: Traffic - speeds Scenario: Speeds that isolate a single node (a) Given the contract extra arguments "--segment-speed-file {speeds_file}" + And the customize extra arguments "--segment-speed-file {speeds_file}" And the node locations | node | lat | lon | | h | 2.075 | 19.1 | - Given the speed file + And the speed file """ 1,2,0 2,1,0 diff --git a/features/testbot/traffic_turn_penalties.feature b/features/testbot/traffic_turn_penalties.feature index a86d5323e..f8654b649 100644 --- a/features/testbot/traffic_turn_penalties.feature +++ b/features/testbot/traffic_turn_penalties.feature @@ -40,6 +40,8 @@ Feature: Traffic - turn penalties applied to turn onto which a phantom node snap 3,4,7,-30 """ And the contract extra arguments "--turn-penalty-file {penalties_file}" + And the customize extra arguments "--turn-penalty-file {penalties_file}" + When I route I should get | from | to | route | speed | time | | a | e | ab,be,be | 36 km/h | 40s +-1 | @@ -56,6 +58,8 @@ Feature: Traffic - turn penalties applied to turn onto which a phantom node snap 3,4,7,-30,100.75 """ And the contract extra arguments "--turn-penalty-file {penalties_file}" + And the customize extra arguments "--turn-penalty-file {penalties_file}" + When I route I should get | from | to | route | speed | time | weights | | a | e | ab,be,be | 36 km/h | 40s +-1 | 16.7,20,0 | diff --git a/features/testbot/weight.feature b/features/testbot/weight.feature index afe3f5e15..de20a6193 100644 --- a/features/testbot/weight.feature +++ b/features/testbot/weight.feature @@ -280,6 +280,7 @@ Feature: Weight tests 2,3,5,25.5,16.7 """ And the contract extra arguments "--segment-speed-file {speeds_file} --turn-penalty-file {penalties_file}" + And the customize extra arguments "--segment-speed-file {speeds_file} --turn-penalty-file {penalties_file}" When I route I should get | waypoints | route | distance | weights | times | @@ -315,6 +316,7 @@ Feature: Weight tests 2,3,5,1 """ And the contract extra arguments "--segment-speed-file {speeds_file} --turn-penalty-file {penalties_file}" + And the customize extra arguments "--segment-speed-file {speeds_file} --turn-penalty-file {penalties_file}" When I route I should get | waypoints | route | distance | weights | times |