Merge branch 'enable-chrome-testing' into master

.gitlab-ci.yml

@@ -102,7 +102,7 @@ build_macosx_36:
     - mv conda-bld ${CONDA_ROOT}
   script:
     - export BEAT_BROWSER_TESTS=true
-    - BOB_TEST_ONLY=true ./_ci/build.sh
+    - BEAT_BROWSER_TESTS=true BOB_TEST_ONLY=true ./_ci/build.sh
   after_script:
     - ./_ci/after_build.sh
 

conda/js/karma.conf.js

@@ -8,9 +8,8 @@ delete webpackConfig.entry;
 module.exports = function (config) {
 	config.set({
 		browsers: [
-			// TODO: try to renable once chromium >55 comes out
-			//'ChromeHeadless',
 			'FirefoxHeadless',
+			//'ChromiumHeadless',
 		],
 		customLaunchers: {
 			FirefoxHeadless: {

conda/meta.yaml

@@ -36,6 +36,9 @@ requirements:
     - beat.cmdline
 
 test:
+  script_env:
+    - BEAT_BROWSER_TESTS
+
   files:
     - js
 
@@ -56,16 +59,14 @@ test:
     - beat editor --help
     - beat editor serve --help
     - nosetests --with-coverage --cover-package={{ name }} -sv {{ name }}
+    - if [ -n "${BEAT_BROWSER_TESTS}" ]; then cd {{ project_dir }}/conda/js; fi
+    - if [ -n "${BEAT_BROWSER_TESTS}" ]; then npm install; fi
+    - if [ -n "${BEAT_BROWSER_TESTS}" ]; then CHROMIUM_BIN=chromium-browser npm test; fi
+    - if [ -n "${BEAT_BROWSER_TESTS}" ]; then cd -; fi
     - sphinx-build -aEW {{ project_dir }}/doc {{ project_dir }}/sphinx
     - sphinx-build -aEb doctest {{ project_dir }}/doc sphinx
     - conda inspect linkages -p $PREFIX {{ name }}  # [not win]
     - conda inspect objects -p $PREFIX {{ name }}  # [osx]
-    {% if environ.get('BEAT_BROWSER_TESTS', False)  %}
-    - cd {{ project_dir }}/conda/js
-    - npm install
-    - npm test
-    - cd -
-    {% endif %}
 
 about:
   home: https://www.idiap.ch/software/beat/