Update tests per library change

Author: camdecoster

test/jasmine/tests/annotations_test.js

@@ -1440,11 +1440,11 @@ describe('annotation effects', function() {
         .then(function() {
             expect(gd._fullLayout.annotations[0].hoverlabel).toEqual({
                 bgcolor: '#444',
-                bordercolor: '#fff',
+                bordercolor: 'rgb(255, 255, 255)',
                 font: {
                     family: 'Arial, sans-serif',
                     size: 13,
-                    color: '#fff',
+                    color: 'rgb(255, 255, 255)',
                     weight: 'normal',
                     style: 'normal',
                     variant: 'normal',

test/jasmine/tests/bar_test.js

@@ -312,7 +312,7 @@ describe('Bar.supplyDefaults', function() {
         supplyDefaults(traceIn, traceOut, defaultColor, layout);
 
         expect(traceOut.marker.pattern.bgcolor).toBe('green');
-        expect(traceOut.marker.pattern.fgcolor).toBe('#fff');
+        expect(traceOut.marker.pattern.fgcolor).toBe('rgb(255, 255, 255)');
         expect(traceOut.marker.pattern.fgopacity).toBe(0.5);
     });
 

test/jasmine/tests/colorscale_test.js

@@ -1045,8 +1045,8 @@ describe('Test colorscale restyle calls:', function() {
                 .then(function() { _assert(msg + ' back to original marker.symbol', exp); });
         }
 
-        var rdbu = ['rgb(5, 10, 172)', 'rgb(53, 70, 208)', 'rgb(227, 153, 104)',
-            'rgb(53, 70, 208)', 'rgb(53, 70, 208)', 'rgb(178, 10, 28)'];
+        var rdbu = ['rgb(5, 10, 172)', 'rgb(53, 71, 208)', 'rgb(227, 153, 104)',
+            'rgb(53, 71, 208)', 'rgb(53, 71, 208)', 'rgb(178, 10, 28)'];
         var grns = ['rgb(0, 68, 27)', 'rgb(12, 119, 52)', 'rgb(174, 222, 167)',
             'rgb(12, 119, 52)', 'rgb(12, 119, 52)', 'rgb(247, 252, 245)'];
 

test/jasmine/tests/funnelarea_test.js

@@ -264,7 +264,7 @@ describe('Funnelarea traces', function() {
 
     it('can use a separate funnelarea colorway and disable extended colors', function(done) {
         Plotly.newPlot(gd, [{type: 'funnelarea', values: [7, 6, 5, 4, 3, 2, 1]}], {colorway: ['#777', '#F00']})
-        .then(_checkSliceColors(['119,119,119', '255,0,0', '170,170,170', '255,102,102', '68,68,68', '153,0,0', '119,119,119']))
+        .then(_checkSliceColors(['119,119,119', '255,0,0', '143,143,143', '255,51,51', '95,95,95', '204,0,0', '119,119,119']))
         .then(function() {
             return Plotly.relayout(gd, {extendfunnelareacolors: false});
         })
@@ -276,7 +276,7 @@ describe('Funnelarea traces', function() {
         .then(function() {
             return Plotly.relayout(gd, {extendfunnelareacolors: null});
         })
-        .then(_checkSliceColors(['255,255,0', '0,255,0', '0,0,255', '255,255,102', '102,255,102', '102,102,255', '153,153,0']))
+        .then(_checkSliceColors(['255,255,0', '0,255,0', '0,0,255', '255,255,51', '51,255,51', '51,51,255', '204,204,0']))
         .then(done, done.fail);
     });
 

test/jasmine/tests/pie_test.js

@@ -288,7 +288,7 @@ describe('Pie traces', function() {
 
     it('can use a separate pie colorway and disable extended colors', function(done) {
         Plotly.newPlot(gd, [{type: 'pie', values: [7, 6, 5, 4, 3, 2, 1]}], {colorway: ['#777', '#F00']})
-        .then(_checkSliceColors(['119,119,119', '255,0,0', '170,170,170', '255,102,102', '68,68,68', '153,0,0', '119,119,119']))
+        .then(_checkSliceColors(['119,119,119', '255,0,0', '143,143,143', '255,51,51', '95,95,95', '204,0,0', '119,119,119']))
         .then(function() {
             return Plotly.relayout(gd, {extendpiecolors: false});
         })
@@ -300,7 +300,7 @@ describe('Pie traces', function() {
         .then(function() {
             return Plotly.relayout(gd, {extendpiecolors: null});
         })
-        .then(_checkSliceColors(['255,255,0', '0,255,0', '0,0,255', '255,255,102', '102,255,102', '102,102,255', '153,153,0']))
+        .then(_checkSliceColors(['255,255,0', '0,255,0', '0,0,255', '255,255,51', '51,255,51', '51,51,255', '204,204,0']))
         .then(done, done.fail);
     });
 

test/jasmine/tests/range_selector_test.js

@@ -540,11 +540,11 @@ describe('range selector interactions:', function() {
     it('should be able to change its style on `relayout`', function(done) {
         var prefix = 'xaxis.rangeselector.';
 
-        checkButtonColor('rgb(238, 238, 238)', 'rgb(212, 212, 212)');
+        checkButtonColor('rgb(238, 238, 238)', 'rgb(214, 214, 214)');
 
         Plotly.relayout(gd, prefix + 'bgcolor', 'red')
         .then(function() {
-            checkButtonColor('rgb(255, 0, 0)', 'rgb(255, 128, 128)');
+            checkButtonColor('rgb(255, 0, 0)', 'rgb(255, 64, 64)');
 
             return Plotly.relayout(gd, prefix + 'activecolor', 'blue');
         }).then(function() {
@@ -578,7 +578,7 @@ describe('range selector interactions:', function() {
         var pos = getRectCenter(button.node());
 
         var fillColor = Color.rgb(gd._fullLayout.xaxis.rangeselector.bgcolor);
-        var activeColor = 'rgb(212, 212, 212)';
+        var activeColor = 'rgb(214, 214, 214)';
 
         expect(button.node().style.fill).toEqual(fillColor);
 

test/jasmine/tests/waterfall_test.js

@@ -11,8 +11,7 @@ var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 
 var supplyAllDefaults = require('../assets/supply_defaults');
-var color = require('../../../src/components/color');
-var rgb = color.rgb;
+var Color = require('../../../src/components/color');
 
 var customAssertions = require('../assets/custom_assertions');
 var assertHoverLabelContent = customAssertions.assertHoverLabelContent;
@@ -259,7 +258,7 @@ describe('Waterfall.supplyDefaults', function() {
             y: [1, 2, 3],
         };
         supplyDefaults(traceIn, traceOut, defaultColor, {});
-        expect(traceOut.connector.line.color).toBe(color.defaultLine);
+        expect(traceOut.connector.line.color).toBe(Color.defaultLine);
     });
 });
 
@@ -668,7 +667,7 @@ describe('A waterfall plot', function() {
         expect(textNode.style.fontSize).toBe(expectedFontProps.size[index] + 'px');
 
         var actualColorRGB = textNode.style.fill;
-        var expectedColorRGB = rgb(expectedFontProps.color[index]);
+        var expectedColorRGB = Color.rgb(expectedFontProps.color[index]);
         expect(actualColorRGB).toBe(expectedColorRGB);
     }
 
@@ -688,7 +687,7 @@ describe('A waterfall plot', function() {
                 var expFontColor = expFontColors[i];
                 var isArray = Array.isArray(expFontColor);
 
-                expect(this.style.fill).toBe(isArray ? rgb(expFontColor[0]) : rgb(expFontColor),
+                expect(this.style.fill).toBe(Color.rgb(isArray ? expFontColor[0] : expFontColor),
                   (label || '') + ', fill for element ' + i);
                 expect(this.style.fillOpacity).toBe(isArray ? expFontColor[1] : '1',
                   (label || '') + ', fillOpacity for element ' + i);
@@ -1067,9 +1066,6 @@ describe('A waterfall plot', function() {
             font: {family: 'arial', color: 'blue', size: 13}
         };
 
-        // Note: insidetextfont.color does NOT inherit from textfont.color
-        // since insidetextfont.color should be contrasting to bar's fill by default.
-        var contrastingLightColorVal = color.contrast('black');
         var expected = {
             y: [10, 20, 30, 40],
             type: 'waterfall',
@@ -1082,7 +1078,8 @@ describe('A waterfall plot', function() {
             },
             insidetextfont: {
                 family: ['"comic sans"', 'arial', 'arial'],
-                color: ['black', 'green', contrastingLightColorVal],
+                // NOTE: 'color' does NOT inherit from 'textfont.color' since 'color' should be contrasting to bar's fill by default.
+                color: ['black', 'green', Color.contrast('white')],
                 size: [8, 12, 16]
             },
             outsidetextfont: {
@@ -1187,7 +1184,7 @@ describe('A waterfall plot', function() {
             text: ['A', 'B', 'C'],
             textposition: 'inside'
         }])
-        .then(assertTextFontColors(['rgb(255, 255, 255)', 'rgb(255, 255, 255)', 'rgb(255, 255, 255)']))
+        .then(assertTextFontColors(['rgb(68, 68, 68)', 'rgb(68, 68, 68)', 'rgb(68, 68, 68)']))
         .then(function() {
             gd.data[0].insidetextfont = {color: 'red'};
             return Plotly.react(gd, gd.data);