Merge branch 'plotly:master' into hoverinfo_none

Author: Domino987

tasks/noci_test.sh

@@ -30,7 +30,7 @@ test_image () {
         $root/test/image/mocks/mapbox_density0-legend.json \
         --mathjax $root/node_modules/mathjax-v2/MathJax.js \
         --plotly $root/build/plotly.js \
-        --mapbox-access-token "pk.eyJ1IjoicGxvdGx5LWpzLXRlc3RzIiwiYSI6ImNrNG9meTJmOTAxa3UzZm10dWdteDQ2eWMifQ.2REjOFyIrleMqwS8H8y1-A" \
+        --mapbox-access-token "pk.eyJ1IjoicGxvdGx5LWRvY3MiLCJhIjoiY2xpMGYyNWgxMGJhdzNzbXhtNGI0Nnk0aSJ9.0oBvi_UUZ0O1N0xk0yfRwg" \
         --output-dir $root/test/image/baselines/ \
         --verbose || EXIT_STATE=$?
 }

tasks/util/constants.js

@@ -239,7 +239,7 @@ module.exports = {
 
     // this mapbox access token is 'public', no need to hide it
     // more info: https://www.mapbox.com/help/define-access-token/
-    mapboxAccessToken: 'pk.eyJ1IjoicGxvdGx5LWpzLXRlc3RzIiwiYSI6ImNrNG9meTJmOTAxa3UzZm10dWdteDQ2eWMifQ.2REjOFyIrleMqwS8H8y1-A',
+    mapboxAccessToken: 'pk.eyJ1IjoicGxvdGx5LWRvY3MiLCJhIjoiY2xpMGYyNWgxMGJhdzNzbXhtNGI0Nnk0aSJ9.0oBvi_UUZ0O1N0xk0yfRwg',
     pathToCredentials: path.join(pathToBuild, 'credentials.json'),
 
     testContainerImage: 'plotly/testbed:latest',

test/image/compare_pixels_test.js

@@ -56,6 +56,9 @@ argv._.forEach(function(pattern) {
     }
 });
 
+// skip for now | TODO: figure out why needed this in https://github.com/plotly/plotly.js/pull/6610
+allMockList = allMockList.filter(function(a) { return a !== 'mapbox_custom-style';});
+
 if(mathjax3) {
     allMockList = [
         'legend_mathjax_title_and_items',

test/image/make_baseline.py

@@ -77,7 +77,8 @@
 # unable to generate baselines for the following mocks
 blacklist = [
     'mapbox_density0-legend',
-    'mapbox_osm-style'
+    'mapbox_osm-style',
+    'mapbox_custom-style' # Figure out why needed this in https://github.com/plotly/plotly.js/pull/6610
 ]
 allNames = [a for a in allNames if a not in blacklist]
 

test/jasmine/tests/mapbox_test.js

@@ -407,7 +407,7 @@ describe('mapbox credentials', function() {
         });
     }, LONG_TIMEOUT_INTERVAL);
 
-    it('@gl should not throw when using a custom mapbox style URL with an access token in the layout', function(done) {
+    it('@noCI @gl should not throw when using a custom mapbox style URL with an access token in the layout', function(done) {
         var cnt = 0;
 
         Plotly.newPlot(gd, [{