merge custom shared assertions into single assets/ module

Author: etpinard

test/jasmine/assets/assert_dims.js

@@ -2,7 +2,22 @@
 
 var d3 = require('d3');
 
-module.exports = function assertStyle(dims, color, opacity) {
+exports.assertDims = function(dims) {
+    var traces = d3.selectAll('.trace');
+
+    expect(traces.size())
+        .toEqual(dims.length, 'to have correct number of traces');
+
+    traces.each(function(_, i) {
+        var trace = d3.select(this);
+        var points = trace.selectAll('.point');
+
+        expect(points.size())
+            .toEqual(dims[i], 'to have correct number of pts in trace ' + i);
+    });
+};
+
+exports.assertStyle = function(dims, color, opacity) {
     var N = dims.reduce(function(a, b) {
         return a + b;
     });

test/jasmine/assets/assert_style.js renamed to test/jasmine/assets/custom_assertions.js

@@ -6,9 +6,11 @@ var Lib = require('@src/lib');
 
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
-var assertDims = require('../assets/assert_dims');
-var assertStyle = require('../assets/assert_style');
 var customMatchers = require('../assets/custom_matchers');
+var customAssertions = require('../assets/custom_assertions');
+
+var assertDims = customAssertions.assertDims;
+var assertStyle = customAssertions.assertStyle;
 
 describe('filter transforms defaults:', function() {
 

test/jasmine/tests/transform_filter_test.js

@@ -3,8 +3,10 @@ var Lib = require('@src/lib');
 
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
-var assertDims = require('../assets/assert_dims');
-var assertStyle = require('../assets/assert_style');
+var customAssertions = require('../assets/custom_assertions');
+
+var assertDims = customAssertions.assertDims;
+var assertStyle = customAssertions.assertStyle;
 
 describe('groupby', function() {
 

test/jasmine/tests/transform_groupby_test.js

@@ -6,9 +6,10 @@ var Lib = require('@src/lib');
 
 var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
-var assertDims = require('../assets/assert_dims');
-var assertStyle = require('../assets/assert_style');
+var customAssertions = require('../assets/custom_assertions');
 
+var assertDims = customAssertions.assertDims;
+var assertStyle = customAssertions.assertStyle;
 
 describe('general transforms:', function() {
     'use strict';