From 623146f91c9753e4adbd6d0f5f33f0912f519cb8 Mon Sep 17 00:00:00 2001 From: etienne Date: Wed, 23 May 2018 15:57:46 -0400 Subject: [PATCH] add @noCIdep jasmine tag to make ./tasks/noci_test.sh work again --- tasks/noci_test.sh | 2 +- test/jasmine/karma.conf.js | 7 +++++++ test/jasmine/tests/plot_api_test.js | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/tasks/noci_test.sh b/tasks/noci_test.sh index 12fbb99621a..6d208a56278 100755 --- a/tasks/noci_test.sh +++ b/tasks/noci_test.sh @@ -6,7 +6,7 @@ root=$(dirname $0)/.. # tests that aren't run on CI (yet) # jasmine specs with @noCI tag -npm run test-jasmine -- --tags=noCI --nowatch || EXIT_STATE=$? +npm run test-jasmine -- --tags=noCI,noCIdep --nowatch || EXIT_STATE=$? # mapbox image tests take too much resources on CI # diff --git a/test/jasmine/karma.conf.js b/test/jasmine/karma.conf.js index 79101a8649f..a427ea4a2ef 100644 --- a/test/jasmine/karma.conf.js +++ b/test/jasmine/karma.conf.js @@ -210,6 +210,13 @@ func.defaultConfig = { // A few tests don't behave well on CI // add @noCI to the spec description to skip a spec on CI // + // Although not recommended, some tests "depend" on other + // tests to pass (e.g. the Plotly.react tests check that + // all available traces and transforms are tested). Tag these + // with @noCIdep, so that + // - $ npm run test-jasmine -- tags=noCI,noCIdep + // can pass. + // // Label tests that require a WebGL-context by @gl so that // they can be skipped using: // - $ npm run test-jasmine -- --skip-tags=gl diff --git a/test/jasmine/tests/plot_api_test.js b/test/jasmine/tests/plot_api_test.js index c5e09531c55..293dd676d98 100644 --- a/test/jasmine/tests/plot_api_test.js +++ b/test/jasmine/tests/plot_api_test.js @@ -2560,7 +2560,7 @@ describe('Test plot api', function() { }); }); - describe('Plotly.react', function() { + describe('@noCIdep Plotly.react', function() { var mockedMethods = [ 'doTraceStyle', 'doColorBars',