Skip to content

Commit e4227aa

Browse files
committed
move checkTicks into custom_assertions
1 parent 0a98a6d commit e4227aa

File tree

5 files changed

+11
-14
lines changed

5 files changed

+11
-14
lines changed

test/jasmine/assets/check_ticks.js

-11
This file was deleted.

test/jasmine/assets/custom_assertions.js

+8
Original file line numberDiff line numberDiff line change
@@ -73,3 +73,11 @@ exports.assertNodeDisplay = function(sel, expectation, msg) {
7373
.toBe(expectation[i], msg + ' display ' + '(item ' + i + ')');
7474
});
7575
};
76+
77+
exports.checkTicks = function(axLetter, vals, msg) {
78+
var selection = d3.selectAll('.' + axLetter + 'tick text');
79+
expect(selection.size()).toBe(vals.length);
80+
selection.each(function(d, i) {
81+
expect(d3.select(this).text()).toBe(vals[i], msg + ': ' + i);
82+
});
83+
};

test/jasmine/tests/bar_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ var createGraphDiv = require('../assets/create_graph_div');
1111
var destroyGraphDiv = require('../assets/destroy_graph_div');
1212
var fail = require('../assets/fail_test');
1313
var customMatchers = require('../assets/custom_matchers');
14-
var checkTicks = require('../assets/check_ticks');
14+
var checkTicks = require('../assets/custom_assertions').checkTicks;
1515
var negateIf = require('../assets/negate_if');
1616

1717
var d3 = require('d3');

test/jasmine/tests/contour_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ var fail = require('../assets/fail_test');
1010
var createGraphDiv = require('../assets/create_graph_div');
1111
var destroyGraphDiv = require('../assets/destroy_graph_div');
1212
var customMatchers = require('../assets/custom_matchers');
13-
var checkTicks = require('../assets/check_ticks');
13+
var checkTicks = require('../assets/custom_assertions').checkTicks;
1414

1515

1616
describe('contour defaults', function() {

test/jasmine/tests/plot_api_test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var customMatchers = require('../assets/custom_matchers');
1616
var createGraphDiv = require('../assets/create_graph_div');
1717
var destroyGraphDiv = require('../assets/destroy_graph_div');
1818
var fail = require('../assets/fail_test');
19-
var checkTicks = require('../assets/check_ticks');
19+
var checkTicks = require('../assets/custom_assertions').checkTicks;
2020
var negateIf = require('../assets/negate_if');
2121

2222

0 commit comments

Comments
 (0)