diff --git a/.circleci/config.yml b/.circleci/config.yml index 2f8c475759a..7bee2130434 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,6 +1,6 @@ version: 2.1 orbs: - browser-tools: circleci/browser-tools@1.5.1 + browser-tools: circleci/browser-tools@2.4.0 # Inspired by: # https://github.com/CircleCI-Public/circleci-demo-workflows/blob/workspace-forwarding/.circleci/config.yml @@ -40,11 +40,11 @@ jobs: working_directory: ~/plotly.js steps: - run: sudo apt-get update - - browser-tools/install-browser-tools: - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "132.0.6834.110" + - browser-tools/install_browser_tools: + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "133.0.6943.126" - attach_workspace: at: ~/ - run: @@ -79,11 +79,11 @@ jobs: working_directory: ~/plotly.js steps: - run: sudo apt-get update - - browser-tools/install-browser-tools: - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "132.0.6834.110" + - browser-tools/install_browser_tools: + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "133.0.6943.126" - attach_workspace: at: ~/ - run: @@ -101,11 +101,11 @@ jobs: working_directory: ~/plotly.js steps: - run: sudo apt-get update - - browser-tools/install-browser-tools: - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "132.0.6834.110" + - browser-tools/install_browser_tools: + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "133.0.6943.126" - attach_workspace: at: ~/ - run: @@ -123,11 +123,11 @@ jobs: working_directory: ~/plotly.js steps: - run: sudo apt-get update - - browser-tools/install-browser-tools: - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "132.0.6834.110" + - browser-tools/install_browser_tools: + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "133.0.6943.126" - attach_workspace: at: ~/ - run: @@ -144,11 +144,11 @@ jobs: parallelism: 8 working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: &browser-versions - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "143.0.7499.192" # TEMPORARY pin until WebGL issues with 144 are resolved + - browser-tools/install_browser_tools: &browser-versions + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "143.0.7499.192" # TEMPORARY pin until WebGL issues with 144 are resolved - attach_workspace: at: ~/ - run: @@ -165,11 +165,11 @@ jobs: working_directory: ~/plotly.js steps: - run: sudo apt-get update - - browser-tools/install-browser-tools: - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "132.0.6834.110" + - browser-tools/install_browser_tools: + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "133.0.6943.126" - attach_workspace: at: ~/ - run: @@ -186,11 +186,11 @@ jobs: working_directory: ~/plotly.js steps: - run: sudo apt-get update - - browser-tools/install-browser-tools: - install-firefox: false - install-geckodriver: false - install-chrome: true - chrome-version: "132.0.6834.110" + - browser-tools/install_browser_tools: + install_firefox: false + install_geckodriver: false + install_chrome: true + chrome_version: "133.0.6943.126" - attach_workspace: at: ~/ - run: @@ -206,9 +206,9 @@ jobs: TZ: "America/Anchorage" working_directory: ~/plotly.js steps: - - browser-tools/install-browser-tools: - install-chrome: false - install-chromedriver: false + - browser-tools/install_browser_tools: + install_chrome: false + install_chromedriver: false - attach_workspace: at: ~/ - run: diff --git a/test/image/baselines/map_custom-style.png b/test/image/baselines/map_custom-style.png index 644ec825de7..7a79826bc26 100644 Binary files a/test/image/baselines/map_custom-style.png and b/test/image/baselines/map_custom-style.png differ diff --git a/test/jasmine/tests/geo_test.js b/test/jasmine/tests/geo_test.js index ee512d56b64..06cc5eedd0f 100644 --- a/test/jasmine/tests/geo_test.js +++ b/test/jasmine/tests/geo_test.js @@ -2759,10 +2759,10 @@ describe('Test geo interactions update marker angles:', function() { }) .then(function() { newPath = getPath(); - expect(newPath).toEqual('M0,0L18.224184879370906,8.238876469671625L19.58636536037447,-4.046516028625488Z'); + expect(newPath).toEqual('M0,0L18.224184922503092,8.238876374264322L19.586365339190138,-4.046516131164082Z'); expect(newPath).not.toEqual(initialPath); - expect(newPath).toEqual('M0,0L18.224184879370906,8.238876469671625L19.58636536037447,-4.046516028625488Z'); + expect(newPath).toEqual('M0,0L18.224184922503092,8.238876374264322L19.586365339190138,-4.046516131164082Z'); expect(initialPath).toEqual('M0,0L-1.5094067529528923,19.942960945008643L10.501042615957648,17.021401351764233Z'); }) .then(done, done.fail); diff --git a/test/jasmine/tests/transition_test.js b/test/jasmine/tests/transition_test.js index b14e6613c25..c566e47ee59 100644 --- a/test/jasmine/tests/transition_test.js +++ b/test/jasmine/tests/transition_test.js @@ -304,6 +304,8 @@ describe('Plotly.react transitions:', function() { }); if(failEarly) { + // Reset spy counters even if test fails (to avoid causing subsequent tests to fail) + resetSpyCounters(); return fail(_msg + '- Wrong calls, assertSpies early fail'); } @@ -334,6 +336,8 @@ describe('Plotly.react transitions:', function() { // sanity check if(actuals.length !== exps.length) { + // Reset spy counters even if test fails (to avoid causing subsequent tests to fail) + resetSpyCounters(); return fail(_msg + '- Something went wrong when building "actual" callData list'); } @@ -628,15 +632,13 @@ describe('Plotly.react transitions:', function() { layout.xaxis.range = [-2, 2]; return Plotly.react(gd, data, layout); }) - .then(delay(50)) + .then(delay(300)) .then(function() { assertSpies('just layout transition', [ [Plots, 'transitionFromReact', 1], [gd._fullLayout._basePlotModules[0], 'transitionAxes', 1], [Axes, 'drawOne', 1], [Axes, 'drawOne', 1], - [Axes, 'drawOne', 1], - [Axes, 'drawOne', 1], // one _module.plot call from the relayout at end of axis transition [Registry, 'call', ['relayout', gd, {'xaxis.range': [-2, 2]}]], [Axes, 'drawOne', 1],