Merge pull request #1923 from HSLdevcom/disable-citybike

disabling citybikes
HSLdevcom · Nov 1, 2017 · f84494c · f84494c
2 parents aa18066 + ad93084
commit f84494c
Show file tree

Hide file tree

Showing 12 changed files with 10 additions and 5 deletions.
diff --git a/app/component/IndexPage.js b/app/component/IndexPage.js
@@ -48,7 +48,8 @@ class IndexPage extends React.Component {
   componentDidMount() {
     const search = this.context.location.search;
 
-    if (search && search.indexOf('citybikes') >= -1) {
+    if (search && search.indexOf('citybikes') > -1) {
+      console.warn('Enabling citybikes');
       this.context.config.transportModes.citybike.defaultValue = true;
     }
 

diff --git a/app/component/ModeFilter.js b/app/component/ModeFilter.js
@@ -17,6 +17,8 @@ class ModeFilter extends React.Component {
     config: PropTypes.object.isRequired,
   };
 
+  // TODO use props instead of config so that visual tests do not break every
+  // time modes are updated...
   availableModes = () =>
     Object.keys(this.context.config.transportModes).filter(
       mode => this.context.config.transportModes[mode].availableForSelection,

diff --git a/app/configurations/config.default.js b/app/configurations/config.default.js
@@ -172,8 +172,9 @@ export default {
     locationAware: true,
   },
 
+  // TODO: Switch back in april
   cityBike: {
-    showCityBikes: true,
+    showCityBikes: false,
 
     useUrl: {
       fi: 'https://www.hsl.fi/citybike',
@@ -283,8 +284,9 @@ export default {
       defaultValue: true,
     },
 
+    // TODO: Switch back in april
     citybike: {
-      availableForSelection: true,
+      availableForSelection: false,
       defaultValue: false,
     },
 

diff --git a/test/flow/page_object/customizeSearch.js b/test/flow/page_object/customizeSearch.js
@@ -1,13 +1,13 @@
 const async = require('async');
 
+// TODO: add citybikes back in april
 const modalities = [
   'bus',
   'tram',
   'rail',
   'subway',
   'ferry',
-  'citybike',
-  'airplane',
+  /* 'citybike', */ 'airplane',
 ];
 
 function clickCanvasToggle() {

diff --git a/test/visual-images/ModeFilter_grey-buttons/grey-buttons/chrome50.png b/test/visual-images/ModeFilter_grey-buttons/grey-buttons/chrome50.png
diff --git a/test/visual-images/ModeFilter_grey-buttons/grey-buttons/edge13.png b/test/visual-images/ModeFilter_grey-buttons/grey-buttons/edge13.png
diff --git a/test/visual-images/ModeFilter_grey-buttons/grey-buttons/ie11.png b/test/visual-images/ModeFilter_grey-buttons/grey-buttons/ie11.png
diff --git a/test/visual-images/ModeFilter_grey-buttons/grey-buttons/safari10.png b/test/visual-images/ModeFilter_grey-buttons/grey-buttons/safari10.png
diff --git a/test/visual-images/ModeFilter_white-buttons/white-buttons/chrome50.png b/test/visual-images/ModeFilter_white-buttons/white-buttons/chrome50.png
diff --git a/test/visual-images/ModeFilter_white-buttons/white-buttons/edge13.png b/test/visual-images/ModeFilter_white-buttons/white-buttons/edge13.png
diff --git a/test/visual-images/ModeFilter_white-buttons/white-buttons/ie11.png b/test/visual-images/ModeFilter_white-buttons/white-buttons/ie11.png
diff --git a/test/visual-images/ModeFilter_white-buttons/white-buttons/safari10.png b/test/visual-images/ModeFilter_white-buttons/white-buttons/safari10.png