Factor out getCBFillAttributes into helper function

Author: anaplian

test/jasmine/tests/colorbar_test.js

@@ -526,38 +526,36 @@ describe('Test colorbar:', function() {
         });
 
         it('creates the same colorbars attributes in newPlot and react', function(done) {
-            var z = [[1, 10], [100, 1000]];
-
-            var expectedAttrs = [];
-            var actualAttrs = [];
-
-            Plotly.newPlot(gd, [{type: 'contour', z: z}])
-            .then(function() {
+            function getCBFillAttributes() {
+                var attrs = [];
                 var colorbars = d3.select(gd).selectAll('.colorbar');
                 colorbars.selectAll('.cbfill').each(function() {
                     var attrsForElem = {};
                     for(var i = 0; i < this.attributes.length; i++) {
                         var attr = this.attributes.item(i);
                         attrsForElem[attr.name] = attr.value;
                     }
-                    expectedAttrs.push(attrsForElem);
+                    attrs.push(attrsForElem);
                 });
+                return attrs;
+            }
+
+            var z = [[1, 10], [100, 1000]];
+
+            var expectedAttrs;
+            var actualAttrs;
+
+            Plotly.newPlot(gd, [{type: 'contour', z: z}])
+            .then(function() {
+                expectedAttrs = getCBFillAttributes();
 
                 return Plotly.newPlot(gd, [{type: 'heatmap', z: z}])
                 .then(function() {
                     return Plotly.react(gd, [{type: 'contour', z: z}]);
                 });
             })
             .then(function() {
-                var colorbars = d3.select(gd).selectAll('.colorbar');
-                colorbars.selectAll('.cbfill').each(function() {
-                    var attrsForElem = {};
-                    for(var i = 0; i < this.attributes.length; i++) {
-                        var attr = this.attributes.item(i);
-                        attrsForElem[attr.name] = attr.value;
-                    }
-                    actualAttrs.push(attrsForElem);
-                });
+                actualAttrs = getCBFillAttributes();
                 expect(actualAttrs).toEqual(expectedAttrs);
             })
             .catch(failTest)