diff --git a/.circleci/config.yml b/.circleci/config.yml index d90a808532f..c91d5b070ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,6 +70,19 @@ jobs: name: Run jasmine tests (batch 2) command: ./.circleci/test.sh jasmine2 + test-jasmine3: + docker: + # need '-browsers' version to test in real (xvfb-wrapped) browsers + - image: circleci/node:10.9.0-browsers + working_directory: ~/plotly.js + steps: + - checkout + - attach_workspace: + at: ~/plotly.js + - run: + name: Run jasmine tests (batch 3) + command: ./.circleci/test.sh jasmine3 + test-image: docker: - image: plotly/testbed:latest @@ -165,6 +178,9 @@ workflows: - test-jasmine2: requires: - build + - test-jasmine3: + requires: + - build - test-image: requires: - build diff --git a/.circleci/test.sh b/.circleci/test.sh index b1861b936cf..62fd478837f 100755 --- a/.circleci/test.sh +++ b/.circleci/test.sh @@ -45,7 +45,6 @@ case $1 in set_tz npm run test-jasmine -- --skip-tags=gl,noCI,flaky || EXIT_STATE=$? - retry npm run test-jasmine -- --tags=flaky --skip-tags=noCI npm run test-bundle || EXIT_STATE=$? exit $EXIT_STATE @@ -63,6 +62,18 @@ case $1 in exit $EXIT_STATE ;; + jasmine3) + set_tz + + SHARDS=($(node $ROOT/tasks/shard_jasmine_tests.js --tag=flaky)) + + for s in ${SHARDS[@]}; do + retry npm run test-jasmine -- "$s" --tags=flaky --skip-tags=noCI + done + + exit $EXIT_STATE + ;; + image) npm run test-image || EXIT_STATE=$? exit $EXIT_STATE diff --git a/test/jasmine/tests/select_test.js b/test/jasmine/tests/select_test.js index 7128933bd84..5f788d6d80a 100644 --- a/test/jasmine/tests/select_test.js +++ b/test/jasmine/tests/select_test.js @@ -175,7 +175,7 @@ describe('Click-to-select', function() { } else { setTimeout(function() { click(x, y, clickOpts); - }, DBLCLICKDELAY * 1.01); + }, DBLCLICKDELAY * 1.03); } return selectedPromise;