do not run conditional cuke tests by default

.travis.yml

@@ -361,8 +361,5 @@ script:
       npm run nodejs-tests
     fi
   - |
-    if [ "${ENABLE_MASON}" == "ON" ]; then
-      npm run test-conditionals
-    fi
   - popd
   - yarn test

cucumber.js

@@ -1,9 +1,9 @@
 module.exports = {
-    default: '--strict --tags ~@stress --tags ~@todo --tags ~@shapelib --require features/support --require features/step_definitions',
-    verify: '--strict --tags ~@stress --tags ~@todo --tags ~@shapelib -f progress --require features/support --require features/step_definitions',
+    default: '--strict --tags ~@stress --tags ~@todo --tags ~@conditionals --require features/support --require features/step_definitions',
+    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 ~@alternative --tags ~@matrix --tags ~@trip --tags ~@shapelib --require features/support --require features/step_definitions -f progress',
+    mld: '--strict --tags ~@stress --tags ~@todo --tags ~@alternative --tags ~@matrix --tags ~@trip --tags --require features/support --require features/step_definitions -f progress',
     conditionals: '--strict --tags @conditionals --require features/support --require features/step_definitions',
     mld_conditionals: '--strict --tags @conditionals --require features/support --require features/step_definitions -f progress'
 }

features/car/conditional_restrictions.feature

@@ -698,9 +698,9 @@ Feature: Car - Turn restrictions
             | restriction | ab        | be      | b        | only_left_turn @ (Mo-Fr 07:00-11:00)  |
 
         When I route I should get
-            | from | to | route                       | turns                                        |
-            | a    | c  | albic,dobe,dobe,albic,albic | depart,turn left,turn uturn,turn left,arrive |
-            | a    | e  | albic,dobe,dobe             | depart,turn left,arrive                      |
+            | from | to | route                       | turns                                            |
+            | a    | c  | albic,dobe,dobe,albic,albic | depart,turn left,continue uturn,turn left,arrive |
+            | a    | e  | albic,dobe,dobe             | depart,turn left,arrive                          |
 
     @only_turning @conditionals
     Scenario: Car - Somewhere in London, the UK, GMT timezone

package.json

@@ -17,7 +17,6 @@
   "scripts": {
     "lint": "eslint -c ./.eslintrc features/step_definitions/ features/support/",
     "test": "npm run lint && node ./node_modules/cucumber/bin/cucumber.js features/ -p verify && node ./node_modules/cucumber/bin/cucumber.js features/ -p mld",
-    "test-conditionals": "npm run lint && node ./node_modules/cucumber/bin/cucumber.js features/ -p conditionals && node ./node_modules/cucumber/bin/cucumber.js features/ -p mld_conditionals",
     "clean": "rm -rf test/cache",
     "docs": "./scripts/build_api_docs.sh",
     "install": "node-pre-gyp install --fallback-to-build=false || ./scripts/node_install.sh",