From f383256a3ebfb088a2c1eee69fd3db8672f36293 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 9 Aug 2024 13:19:18 +0200 Subject: [PATCH 01/15] Use cimg/node instead of circleci/node --- .circleci/config.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d762d63f6d3..c3bceec4889 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -307,7 +307,7 @@ jobs: test-baselines: docker: - - image: circleci/node:16.9.0 + - image: cimg/node:16.17.1 working_directory: ~/plotly.js steps: - attach_workspace: @@ -321,7 +321,7 @@ jobs: test-baselines-virtual-webgl: docker: - - image: circleci/node:16.9.0 + - image: cimg/node:16.17.1 working_directory: ~/plotly.js steps: - attach_workspace: @@ -335,7 +335,7 @@ jobs: test-baselines-b64: docker: - - image: circleci/node:16.9.0 + - image: cimg/node:16.17.1 working_directory: ~/plotly.js steps: - attach_workspace: @@ -349,7 +349,7 @@ jobs: test-baselines-mathjax3: docker: - - image: circleci/node:16.9.0 + - image: cimg/node:16.17.1 working_directory: ~/plotly.js steps: - attach_workspace: @@ -386,7 +386,7 @@ jobs: test-exports: docker: - - image: circleci/node:16.9.0 + - image: cimg/node:16.17.1 working_directory: ~/plotly.js steps: - attach_workspace: From 8499eadff8dc6d288ffa6686f670cf19198b486d Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 9 Aug 2024 13:21:23 +0200 Subject: [PATCH 02/15] add draftlog --- draftlogs/7080_change.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 draftlogs/7080_change.md diff --git a/draftlogs/7080_change.md b/draftlogs/7080_change.md new file mode 100644 index 00000000000..198c9e890b8 --- /dev/null +++ b/draftlogs/7080_change.md @@ -0,0 +1 @@ + - Use cimg/node instead of circleci/node in CI [[#7080](https://github.com/plotly/plotly.js/pull/7080)] \ No newline at end of file From 5c4c7c7f0c77d8a200bb64d6c840aa8899eabbca Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 9 Aug 2024 13:22:37 +0200 Subject: [PATCH 03/15] use latest 16.x --- .circleci/config.yml | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c3bceec4889..bb910ade2b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -28,7 +28,7 @@ jobs: install-and-cibuild: # main cibuild using node 16 & npm 7 docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - checkout @@ -52,7 +52,7 @@ jobs: timezone-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions @@ -84,7 +84,7 @@ jobs: no-gl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -103,7 +103,7 @@ jobs: webgl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -122,7 +122,7 @@ jobs: virtual-webgl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -141,7 +141,7 @@ jobs: flaky-no-gl-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -159,7 +159,7 @@ jobs: bundle-jasmine: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -177,7 +177,7 @@ jobs: mathjax-firefox81: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -196,7 +196,7 @@ jobs: mathjax-firefox82: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -215,7 +215,7 @@ jobs: mathjax-firefoxLatest: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.17.1-browsers + - image: cimg/node:16.20.2-browsers environment: # Alaska time (arbitrary timezone to test date logic) TZ: "America/Anchorage" @@ -307,7 +307,7 @@ jobs: test-baselines: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -321,7 +321,7 @@ jobs: test-baselines-virtual-webgl: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -335,7 +335,7 @@ jobs: test-baselines-b64: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -349,7 +349,7 @@ jobs: test-baselines-mathjax3: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -386,7 +386,7 @@ jobs: test-exports: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -400,7 +400,7 @@ jobs: mock-validation: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -414,7 +414,7 @@ jobs: source-syntax: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - attach_workspace: @@ -425,7 +425,7 @@ jobs: publish-dist: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - checkout @@ -495,7 +495,7 @@ jobs: test-stackgl-bundle: docker: - - image: cimg/node:16.17.1 + - image: cimg/node:16.20.2 working_directory: ~/plotly.js steps: - checkout From 590734aa747857c852f2856af307d28b5d3578e4 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Fri, 9 Aug 2024 13:36:59 +0200 Subject: [PATCH 04/15] remove &browser-versions --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb910ade2b6..640444eb6a3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,7 @@ jobs: - image: cimg/node:16.20.2-browsers working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-firefox: false install-geckodriver: false - attach_workspace: @@ -91,7 +91,7 @@ jobs: parallelism: 12 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-firefox: false install-geckodriver: false - attach_workspace: @@ -110,7 +110,7 @@ jobs: parallelism: 8 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-firefox: false install-geckodriver: false - attach_workspace: @@ -129,7 +129,7 @@ jobs: parallelism: 8 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-firefox: false install-geckodriver: false - attach_workspace: @@ -147,7 +147,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-firefox: false install-geckodriver: false - attach_workspace: @@ -165,7 +165,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-firefox: false install-geckodriver: false - attach_workspace: @@ -183,7 +183,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: firefox-version: '81.0' install-chrome: false install-chromedriver: false @@ -202,7 +202,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: firefox-version: '82.0' install-chrome: false install-chromedriver: false @@ -221,7 +221,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions + - browser-tools/install-browser-tools: install-chrome: false install-chromedriver: false - attach_workspace: From 1bc040180983acec13d5c2ba80be5a34777c2c38 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Sat, 10 Aug 2024 00:37:07 +0200 Subject: [PATCH 05/15] Revert "remove &browser-versions" This reverts commit 5ab95141dd220e958a199c3e3015385aa8fa8c2f. --- .circleci/config.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 640444eb6a3..bb910ade2b6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -55,7 +55,7 @@ jobs: - image: cimg/node:16.20.2-browsers working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-firefox: false install-geckodriver: false - attach_workspace: @@ -91,7 +91,7 @@ jobs: parallelism: 12 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-firefox: false install-geckodriver: false - attach_workspace: @@ -110,7 +110,7 @@ jobs: parallelism: 8 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-firefox: false install-geckodriver: false - attach_workspace: @@ -129,7 +129,7 @@ jobs: parallelism: 8 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-firefox: false install-geckodriver: false - attach_workspace: @@ -147,7 +147,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-firefox: false install-geckodriver: false - attach_workspace: @@ -165,7 +165,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-firefox: false install-geckodriver: false - attach_workspace: @@ -183,7 +183,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions firefox-version: '81.0' install-chrome: false install-chromedriver: false @@ -202,7 +202,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions firefox-version: '82.0' install-chrome: false install-chromedriver: false @@ -221,7 +221,7 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: + - browser-tools/install-browser-tools: &browser-versions install-chrome: false install-chromedriver: false - attach_workspace: From 9de4616d43e9fa628190958fa17d0cb707ee75da Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Sat, 10 Aug 2024 00:37:47 +0200 Subject: [PATCH 06/15] remove version quotes --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bb910ade2b6..181785e5a3b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,7 +184,7 @@ jobs: working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions - firefox-version: '81.0' + firefox-version: 81.0 install-chrome: false install-chromedriver: false - attach_workspace: @@ -203,7 +203,7 @@ jobs: working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions - firefox-version: '82.0' + firefox-version: 82.0 install-chrome: false install-chromedriver: false - attach_workspace: From e7db5cd148a1bf4cd0a0df809275f5e5f08ebf63 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 18:50:11 +0200 Subject: [PATCH 07/15] newline in draft --- draftlogs/7080_change.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/draftlogs/7080_change.md b/draftlogs/7080_change.md index 198c9e890b8..320b22b212b 100644 --- a/draftlogs/7080_change.md +++ b/draftlogs/7080_change.md @@ -1 +1,2 @@ - - Use cimg/node instead of circleci/node in CI [[#7080](https://github.com/plotly/plotly.js/pull/7080)] \ No newline at end of file + - Use cimg/node instead of circleci/node in CI [[#7080](https://github.com/plotly/plotly.js/pull/7080)] + \ No newline at end of file From 49c30328cf2bf5019e678bfb10a9042526bd1209 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 18:55:28 +0200 Subject: [PATCH 08/15] quotes --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 181785e5a3b..d44cdeb2a1a 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,7 +184,7 @@ jobs: working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions - firefox-version: 81.0 + firefox-version: "81.0" install-chrome: false install-chromedriver: false - attach_workspace: @@ -203,7 +203,7 @@ jobs: working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions - firefox-version: 82.0 + firefox-version: "82.0" install-chrome: false install-chromedriver: false - attach_workspace: From 3ab76aa3aa289e8154912b9160ea84a9b263bb19 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:19:27 +0200 Subject: [PATCH 09/15] move 20 versions up for ff --- .circleci/config.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d44cdeb2a1a..d6c61111fa5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -184,13 +184,13 @@ jobs: working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions - firefox-version: "81.0" + firefox-version: "101.0" install-chrome: false install-chromedriver: false - attach_workspace: at: ~/ - run: - name: Test MathJax on firefox-81 + name: Test MathJax on firefox-101 command: .circleci/test.sh mathjax-firefox mathjax-firefox82: @@ -203,14 +203,14 @@ jobs: working_directory: ~/plotly.js steps: - browser-tools/install-browser-tools: &browser-versions - firefox-version: "82.0" + firefox-version: "102.0" install-chrome: false install-chromedriver: false - attach_workspace: at: ~/ - run: - name: Test MathJax on firefox-82 - command: .circleci/test.sh mathjax-firefox82+ + name: Test MathJax on firefox-102 + command: .circleci/test.sh mathjax-firefox102+ mathjax-firefoxLatest: docker: @@ -228,7 +228,7 @@ jobs: at: ~/ - run: name: Test MathJax on firefox-latest - command: .circleci/test.sh mathjax-firefox82+ + command: .circleci/test.sh mathjax-firefox102+ make-baselines-virtual-webgl: parallelism: 8 From 8b886fa4a76b82dfc91a0f9f5ed8e2e3c52f92ad Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:21:21 +0200 Subject: [PATCH 10/15] bump firefox --- .circleci/config.yml | 8 ++++---- .circleci/test.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d6c61111fa5..115240e57ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,7 +174,7 @@ jobs: name: Run jasmine tests (part D) command: .circleci/test.sh bundle-jasmine - mathjax-firefox81: + mathjax-firefox101: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - image: cimg/node:16.20.2-browsers @@ -193,7 +193,7 @@ jobs: name: Test MathJax on firefox-101 command: .circleci/test.sh mathjax-firefox - mathjax-firefox82: + mathjax-firefox102: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers - image: cimg/node:16.20.2-browsers @@ -525,10 +525,10 @@ workflows: - bundle-jasmine: requires: - install-and-cibuild - - mathjax-firefox81: + - mathjax-firefox101: requires: - install-and-cibuild - - mathjax-firefox82: + - mathjax-firefox102: requires: - install-and-cibuild - mathjax-firefoxLatest: diff --git a/.circleci/test.sh b/.circleci/test.sh index e22f3cb6384..19186d86102 100755 --- a/.circleci/test.sh +++ b/.circleci/test.sh @@ -84,7 +84,7 @@ case $1 in exit $EXIT_STATE ;; - mathjax-firefox82+) + mathjax-firefox102+) ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch && From cb19463588453c01bb10a4bd4b9f6f3c0ee6afd2 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:21:56 +0200 Subject: [PATCH 11/15] bump ff --- .circleci/test.sh | 4 ++-- tasks/test_syntax.js | 2 +- test/jasmine/bundle_tests/mathjax_test.js | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.circleci/test.sh b/.circleci/test.sh index 19186d86102..06f116d51f3 100755 --- a/.circleci/test.sh +++ b/.circleci/test.sh @@ -85,8 +85,8 @@ case $1 in ;; mathjax-firefox102+) - ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF82 --nowatch && - ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF82 --nowatch && + ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF102 --nowatch && + ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF102 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$? exit $EXIT_STATE diff --git a/tasks/test_syntax.js b/tasks/test_syntax.js index f948c2892bb..d200237e9d1 100644 --- a/tasks/test_syntax.js +++ b/tasks/test_syntax.js @@ -31,7 +31,7 @@ assertCircularDeps(); // check for for focus and exclude jasmine blocks function assertJasmineSuites() { var BLACK_LIST = ['fdescribe', 'fit', 'xdescribe', 'xit']; - var TAGS = ['noCI', 'noCIdep', 'noFF82', 'gl', 'flaky']; + var TAGS = ['noCI', 'noCIdep', 'noFF102', 'gl', 'flaky']; var IT_ONLY_TAGS = ['gl', 'flaky']; var logs = []; diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js index 03d1f2f9c44..3f8c8ac88d6 100644 --- a/test/jasmine/bundle_tests/mathjax_test.js +++ b/test/jasmine/bundle_tests/mathjax_test.js @@ -95,7 +95,7 @@ describe('Test MathJax v' + mathjaxVersion + ':', function() { .then(done, done.fail); }); - it('@noFF82 should scoot x-axis title (with MathJax) below x-axis ticks', function(done) { + it('@noFF102 should scoot x-axis title (with MathJax) below x-axis ticks', function(done) { expect(window.MathJax).toBeDefined(); testTitleScoot({ From 3bd036981afc5fd078a13107c09253cd15047266 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:31:27 +0200 Subject: [PATCH 12/15] don't use noFF102 --- .circleci/test.sh | 4 ++-- tasks/test_syntax.js | 2 +- test/jasmine/bundle_tests/mathjax_test.js | 19 ------------------- 3 files changed, 3 insertions(+), 22 deletions(-) diff --git a/.circleci/test.sh b/.circleci/test.sh index 06f116d51f3..d9c21a5846d 100755 --- a/.circleci/test.sh +++ b/.circleci/test.sh @@ -85,8 +85,8 @@ case $1 in ;; mathjax-firefox102+) - ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --skip-tags=noFF102 --nowatch && - ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --skip-tags=noFF102 --nowatch && + ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch && + ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --nowatch || EXIT_STATE=$? exit $EXIT_STATE diff --git a/tasks/test_syntax.js b/tasks/test_syntax.js index d200237e9d1..6e613daf4fa 100644 --- a/tasks/test_syntax.js +++ b/tasks/test_syntax.js @@ -31,7 +31,7 @@ assertCircularDeps(); // check for for focus and exclude jasmine blocks function assertJasmineSuites() { var BLACK_LIST = ['fdescribe', 'fit', 'xdescribe', 'xit']; - var TAGS = ['noCI', 'noCIdep', 'noFF102', 'gl', 'flaky']; + var TAGS = ['noCI', 'noCIdep', 'gl', 'flaky']; var IT_ONLY_TAGS = ['gl', 'flaky']; var logs = []; diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js index 3f8c8ac88d6..274ff73d86c 100644 --- a/test/jasmine/bundle_tests/mathjax_test.js +++ b/test/jasmine/bundle_tests/mathjax_test.js @@ -95,25 +95,6 @@ describe('Test MathJax v' + mathjaxVersion + ':', function() { .then(done, done.fail); }); - it('@noFF102 should scoot x-axis title (with MathJax) below x-axis ticks', function(done) { - expect(window.MathJax).toBeDefined(); - - testTitleScoot({ - data: [{ - y: [1, 2, 1] - }], - layout: { - xaxis: {title: texTitle}, - width: 500, - height: 500, - margin: {t: 100, b: 100, l: 100, r: 100} - } - }, { - xCategories: longCats - }) - .then(done, done.fail); - }); - it('should scoot x-axis title below x-axis ticks (with MathJax)', function(done) { expect(window.MathJax).toBeDefined(); From 2af18108a2ba5237235c12181d9c28238537dcb4 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:33:39 +0200 Subject: [PATCH 13/15] Enable test --- test/jasmine/bundle_tests/mathjax_test.js | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js index 274ff73d86c..33f85549ae6 100644 --- a/test/jasmine/bundle_tests/mathjax_test.js +++ b/test/jasmine/bundle_tests/mathjax_test.js @@ -95,6 +95,25 @@ describe('Test MathJax v' + mathjaxVersion + ':', function() { .then(done, done.fail); }); + it('should scoot x-axis title (with MathJax) below x-axis ticks', function(done) { + expect(window.MathJax).toBeDefined(); + + testTitleScoot({ + data: [{ + y: [1, 2, 1] + }], + layout: { + xaxis: {title: texTitle}, + width: 500, + height: 500, + margin: {t: 100, b: 100, l: 100, r: 100} + } + }, { + xCategories: longCats + }) + .then(done, done.fail); + }); + it('should scoot x-axis title below x-axis ticks (with MathJax)', function(done) { expect(window.MathJax).toBeDefined(); From c01c2161d2b3ac0ed570b1bdf8abf81360f5be08 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:34:30 +0200 Subject: [PATCH 14/15] comment out bug in FF --- test/jasmine/bundle_tests/mathjax_test.js | 36 ++++++++++++----------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/test/jasmine/bundle_tests/mathjax_test.js b/test/jasmine/bundle_tests/mathjax_test.js index 33f85549ae6..16b51135f84 100644 --- a/test/jasmine/bundle_tests/mathjax_test.js +++ b/test/jasmine/bundle_tests/mathjax_test.js @@ -95,24 +95,26 @@ describe('Test MathJax v' + mathjaxVersion + ':', function() { .then(done, done.fail); }); - it('should scoot x-axis title (with MathJax) below x-axis ticks', function(done) { - expect(window.MathJax).toBeDefined(); - testTitleScoot({ - data: [{ - y: [1, 2, 1] - }], - layout: { - xaxis: {title: texTitle}, - width: 500, - height: 500, - margin: {t: 100, b: 100, l: 100, r: 100} - } - }, { - xCategories: longCats - }) - .then(done, done.fail); - }); + // Firefox bug - see https://bugzilla.mozilla.org/show_bug.cgi?id=1350755 + // it('should scoot x-axis title (with MathJax) below x-axis ticks', function(done) { + // expect(window.MathJax).toBeDefined(); + + // testTitleScoot({ + // data: [{ + // y: [1, 2, 1] + // }], + // layout: { + // xaxis: {title: texTitle}, + // width: 500, + // height: 500, + // margin: {t: 100, b: 100, l: 100, r: 100} + // } + // }, { + // xCategories: longCats + // }) + // .then(done, done.fail); + // }); it('should scoot x-axis title below x-axis ticks (with MathJax)', function(done) { expect(window.MathJax).toBeDefined(); From 3293402f57de69f1db38e283f3f353197440b3a8 Mon Sep 17 00:00:00 2001 From: Birk Skyum Date: Mon, 12 Aug 2024 19:38:11 +0200 Subject: [PATCH 15/15] cleanup --- .circleci/config.yml | 46 +------------------------------------------- .circleci/test.sh | 2 +- 2 files changed, 2 insertions(+), 46 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 115240e57ec..76e2dff1bfe 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -174,44 +174,6 @@ jobs: name: Run jasmine tests (part D) command: .circleci/test.sh bundle-jasmine - mathjax-firefox101: - docker: - # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers - environment: - # Alaska time (arbitrary timezone to test date logic) - TZ: "America/Anchorage" - working_directory: ~/plotly.js - steps: - - browser-tools/install-browser-tools: &browser-versions - firefox-version: "101.0" - install-chrome: false - install-chromedriver: false - - attach_workspace: - at: ~/ - - run: - name: Test MathJax on firefox-101 - command: .circleci/test.sh mathjax-firefox - - mathjax-firefox102: - docker: - # need '-browsers' version to test in real (xvfb-wrapped) browsers - - image: cimg/node:16.20.2-browsers - environment: - # Alaska time (arbitrary timezone to test date logic) - TZ: "America/Anchorage" - working_directory: ~/plotly.js - steps: - - browser-tools/install-browser-tools: &browser-versions - firefox-version: "102.0" - install-chrome: false - install-chromedriver: false - - attach_workspace: - at: ~/ - - run: - name: Test MathJax on firefox-102 - command: .circleci/test.sh mathjax-firefox102+ - mathjax-firefoxLatest: docker: # need '-browsers' version to test in real (xvfb-wrapped) browsers @@ -228,7 +190,7 @@ jobs: at: ~/ - run: name: Test MathJax on firefox-latest - command: .circleci/test.sh mathjax-firefox102+ + command: .circleci/test.sh mathjax-firefox make-baselines-virtual-webgl: parallelism: 8 @@ -525,12 +487,6 @@ workflows: - bundle-jasmine: requires: - install-and-cibuild - - mathjax-firefox101: - requires: - - install-and-cibuild - - mathjax-firefox102: - requires: - - install-and-cibuild - mathjax-firefoxLatest: requires: - install-and-cibuild diff --git a/.circleci/test.sh b/.circleci/test.sh index d9c21a5846d..b814c1dd3e8 100755 --- a/.circleci/test.sh +++ b/.circleci/test.sh @@ -84,7 +84,7 @@ case $1 in exit $EXIT_STATE ;; - mathjax-firefox102+) + mathjax-firefox) ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax --mathjax3 --nowatch && ./node_modules/karma/bin/karma start test/jasmine/karma.conf.js --FF --bundleTest=mathjax_config --mathjax3 --nowatch &&