Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 39 additions & 39 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down
Binary file modified test/image/baselines/map_custom-style.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions test/jasmine/tests/geo_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
8 changes: 5 additions & 3 deletions test/jasmine/tests/transition_test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
}

Expand Down Expand Up @@ -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');
}

Expand Down Expand Up @@ -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],
Expand Down