fail->failTest in 2 more test files

Author: alexcjohnson

test/jasmine/tests/carpet_test.js

@@ -9,7 +9,7 @@ var smoothFill = require('@src/traces/carpet/smooth_fill_array');
 var d3 = require('d3');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
-var fail = require('../assets/fail_test');
+var failTest = require('../assets/fail_test');
 
 var mouseEvent = require('../assets/mouse_event');
 var assertHoverLabelContent = require('../assets/custom_assertions').assertHoverLabelContent;
@@ -463,7 +463,7 @@ describe('Test carpet interactions:', function() {
             expect(countCarpets()).toEqual(0);
             expect(countContourTraces()).toEqual(0);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -494,7 +494,7 @@ describe('Test carpet interactions:', function() {
             expect(countCarpets()).toEqual(0);
             expect(countContourTraces()).toEqual(0);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -508,7 +508,7 @@ describe('Test carpet interactions:', function() {
         .then(function() {
             return Plotly.relayout(gd, 'yaxis.range', [7, 8]);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -534,7 +534,7 @@ describe('Test carpet interactions:', function() {
         .then(function() {
             _assert(3);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 });
@@ -592,7 +592,7 @@ describe('scattercarpet array attributes', function() {
                 expect(pt.mlc).toBe(mlc[i]);
             }
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 });
@@ -691,7 +691,7 @@ describe('contourcarpet plotting & editing', function() {
         .then(function() {
             expect(getIndices()).toEqual([1, 2]);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 });

test/jasmine/tests/contour_test.js

@@ -8,7 +8,7 @@ var Contour = require('@src/traces/contour');
 var makeColorMap = require('@src/traces/contour/make_color_map');
 var colorScales = require('@src/components/colorscale/scales');
 
-var fail = require('../assets/fail_test');
+var failTest = require('../assets/fail_test');
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var checkTicks = require('../assets/custom_assertions').checkTicks;
@@ -388,7 +388,7 @@ describe('contour plotting and editing', function() {
             checkTicks('y', ['Jan 102016', 'Jan 24', 'Feb 7', 'Feb 21'], 'date y #2');
             expect(gd._fullLayout.yaxis.type).toBe('date');
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -407,7 +407,7 @@ describe('contour plotting and editing', function() {
         .then(function() {
             expect(gd.querySelector('.contourlabels text').textContent).toBe('0.41');
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -458,7 +458,7 @@ describe('contour plotting and editing', function() {
                 contoursIndex: 3
             });
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -500,7 +500,7 @@ describe('contour plotting and editing', function() {
             expect(gd.calcdata[0][0].z).toEqual([[1, 2], [2, 4], [1, 2.5]]);
             expect(gd.calcdata[0][0].zmask).toEqual([[1, 1], [0, 1], [1, 0]]);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 
@@ -530,7 +530,7 @@ describe('contour plotting and editing', function() {
         .then(function() {
             expect(getIndices()).toEqual([0, 1]);
         })
-        .catch(fail)
+        .catch(failTest)
         .then(done);
     });
 });