diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 631b5a03fe0378c873a795abb083abc4489869a0..eb83d3cbaf242a31f1a7eab703d391ff771b95ae 100644 --- a/.gitlab-ci.yml +++ b/.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 diff --git a/conda/js/karma.conf.js b/conda/js/karma.conf.js index 98c6bd36dac6c191beddc069b093e8bf78aeeb01..c50582ce9334a302bd2cade6ff023688f210a7be 100644 --- a/conda/js/karma.conf.js +++ b/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: { diff --git a/conda/meta.yaml b/conda/meta.yaml index 54bd4e00755c1d22a2dc3b930dda34e4c3ae1548..d8d7edd939292419db07136a9192228a3e83a46b 100644 --- a/conda/meta.yaml +++ b/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/