Skip to content

Commit e9e0c83

Browse files
committed
improve scatter3d hover test
- AJ-proof description strings - add hover wrapper
1 parent 62ffd06 commit e9e0c83

File tree

1 file changed

+19
-22
lines changed

1 file changed

+19
-22
lines changed

test/jasmine/tests/gl_plot_interact_test.js

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -102,46 +102,46 @@ describe('Test gl plot interactions', function() {
102102

103103
function assertHoverText(xLabel, yLabel, zLabel) {
104104
var node = d3.selectAll('g.hovertext');
105-
expect(node.size()).toEqual(1, 'one hover text group');
105+
expect(node.size()).toEqual(1, 'hover text group');
106106

107107
var tspan = d3.selectAll('g.hovertext').selectAll('tspan')[0];
108-
expect(tspan[0].innerHTML).toEqual(xLabel, 'x val on hover');
109-
expect(tspan[1].innerHTML).toEqual(yLabel, 'y val on hover');
110-
expect(tspan[2].innerHTML).toEqual(zLabel, 'z val on hover');
108+
expect(tspan[0].innerHTML).toEqual(xLabel, 'x val');
109+
expect(tspan[1].innerHTML).toEqual(yLabel, 'y val');
110+
expect(tspan[2].innerHTML).toEqual(zLabel, 'z val');
111111
}
112112

113-
it('should have', function(done) {
113+
it('makes the right hover text and point data', function(done) {
114+
115+
function hover() {
116+
mouseEventScatter3d('mouseover');
117+
return delay;
118+
}
119+
114120
assertHoverText('x: 140.72', 'y: −96.97', 'z: −96.97');
115121

116122
expect(Object.keys(ptData)).toEqual([
117123
'x', 'y', 'z',
118124
'data', 'fullData', 'curveNumber', 'pointNumber'
119125
], 'correct hover data fields');
120126

121-
expect(ptData.x).toBe('140.72', 'x val hover data');
122-
expect(ptData.y).toBe('−96.97', 'y val hover data');
123-
expect(ptData.z).toEqual('−96.97', 'z val hover data');
124-
expect(ptData.curveNumber).toEqual(0, 'curveNumber hover data');
125-
expect(ptData.pointNumber).toEqual(2, 'pointNumber hover data');
127+
expect(ptData.x).toBe('140.72', 'x val');
128+
expect(ptData.y).toBe('−96.97', 'y val');
129+
expect(ptData.z).toEqual('−96.97', 'z val');
130+
expect(ptData.curveNumber).toEqual(0, 'curveNumber');
131+
expect(ptData.pointNumber).toEqual(2, 'pointNumber');
126132

127133
Plotly.restyle(gd, {
128134
x: [['2016-01-11', '2016-01-12', '2017-01-01', '2017-02']]
129135
})
130-
.then(function() {
131-
mouseEventScatter3d('mouseover');
132-
return delay;
133-
})
136+
.then(hover)
134137
.then(function() {
135138
assertHoverText('x: Jan 1, 2017', 'y: −96.97', 'z: −96.97');
136139

137140
return Plotly.restyle(gd, {
138141
x: [[new Date(2017, 2, 1), new Date(2017, 2, 2), new Date(2017, 2, 3), new Date(2017, 2, 4)]]
139142
});
140143
})
141-
.then(function() {
142-
mouseEventScatter3d('mouseover');
143-
return delay;
144-
})
144+
.then(hover)
145145
.then(function() {
146146
assertHoverText('x: Mar 3, 2017', 'y: −96.97', 'z: −96.97');
147147

@@ -152,10 +152,7 @@ describe('Test gl plot interactions', function() {
152152
'scene.zaxis.type': 'log'
153153
});
154154
})
155-
.then(function() {
156-
mouseEventScatter3d('mouseover');
157-
return delay;
158-
})
155+
.then(hover)
159156
.then(function() {
160157
assertHoverText('x: Mar 3, 2017', 'y: c', 'z: 100k');
161158
})

0 commit comments

Comments
 (0)