Skip to content

Commit 1c6014a

Browse files
committed
#313 rebase post-merge change
1 parent 92a7c90 commit 1c6014a

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

test/jasmine/tests/click_test.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,14 @@ describe('Test click interactions:', function() {
9696
});
9797
});
9898

99-
describe('click events with hoverinfo set to none', function() {
99+
describe('click event with hoverinfo set to none - plotly_click', function() {
100100
var futureData;
101101

102102
beforeEach(function(done) {
103-
gd = createGraphDiv();
104103

105-
var mockCopy = Lib.extendDeep({}, mock);
106-
mockCopy.data[0].hoverinfo = 'none';
107-
Plotly.plot(gd, mockCopy.data, mockCopy.layout)
104+
var modifiedMockCopy = Lib.extendDeep({}, mockCopy);
105+
modifiedMockCopy.data[0].hoverinfo = 'none';
106+
Plotly.plot(gd, modifiedMockCopy.data, modifiedMockCopy.layout)
108107
.then(done);
109108

110109
gd.on('plotly_click', function(data) {
@@ -128,15 +127,14 @@ describe('Test click interactions:', function() {
128127
});
129128
});
130129

131-
describe('click events with hoverinfo set to none', function() {
130+
describe('click events with hoverinfo set to none - plotly_hover', function() {
132131
var futureData;
133132

134133
beforeEach(function(done) {
135-
gd = createGraphDiv();
136134

137-
var mockCopy = Lib.extendDeep({}, mock);
138-
mockCopy.data[0].hoverinfo = 'none';
139-
Plotly.plot(gd, mockCopy.data, mockCopy.layout)
135+
var modifiedMockCopy = Lib.extendDeep({}, mockCopy);
136+
modifiedMockCopy.data[0].hoverinfo = 'none';
137+
Plotly.plot(gd, modifiedMockCopy.data, modifiedMockCopy.layout)
140138
.then(done);
141139

142140
gd.on('plotly_hover', function(data) {

test/jasmine/tests/gl_plot_interact_test.js

+1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ describe('Test gl plot interactions', function() {
5252
destroyGraphDiv();
5353
});
5454

55+
// put callback in the event queue
5556
function delay(done) {
5657
setTimeout(done, 0);
5758
}

0 commit comments

Comments
 (0)