Skip to content

Commit 0be5966

Browse files
etpinardetpinard
committed
flatten test trees
1 parent 45d6a5f commit 0be5966

File tree

1 file changed

+102
-119
lines changed

1 file changed

+102
-119
lines changed

‎test/jasmine/tests/click_test.js‎

Lines changed: 102 additions & 119 deletions
Original file line numberDiff line numberDiff line change
@@ -130,121 +130,96 @@ describe('click interactions', function() {
130130
return mockCopy;
131131
}
132132

133-
describe('when set to \'reset+autorange\' (the default)', function() {
134-
it('should work when \'autorange\' is on', function(done) {
135-
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function(){
136-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
137-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
133+
it('when set to \'reset+autorange\' (the default) should work when \'autorange\' is on', function(done) {
134+
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function(){
135+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
136+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
138137

139-
Plotly.relayout(gd, update).then(function() {
140-
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
141-
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
138+
Plotly.relayout(gd, update).then(function() {
139+
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
140+
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
142141

143-
doubleClick(blankPos[0], blankPos[1], function() {
144-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
145-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
142+
doubleClick(blankPos[0], blankPos[1], function() {
143+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
144+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
146145

147-
done();
148-
});
146+
done();
149147
});
150148
});
151149
});
150+
});
152151

153-
it('should reset to set range on double click', function(done) {
154-
mockCopy = setRanges(mockCopy);
155-
156-
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function(){
157-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
158-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
159-
160-
Plotly.relayout(gd, update).then(function() {
161-
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
162-
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
152+
it('when set to \'reset+autorange\' (the default) should reset to set range on double click', function(done) {
153+
mockCopy = setRanges(mockCopy);
163154

164-
doubleClick(blankPos[0], blankPos[1], function() {
165-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
166-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
155+
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function(){
156+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
157+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
167158

168-
done();
169-
});
170-
});
171-
});
172-
});
173-
174-
it('should autosize on 1st double click and reset on 2nd', function(done) {
175-
mockCopy = setRanges(mockCopy);
176-
177-
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function(){
178-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
179-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
159+
Plotly.relayout(gd, update).then(function() {
160+
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
161+
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
180162

181163
doubleClick(blankPos[0], blankPos[1], function() {
182-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
183-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
184-
185-
doubleClick(blankPos[0], blankPos[1], function() {
186-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
187-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
164+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
165+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
188166

189-
done();
190-
});
167+
done();
191168
});
192169
});
193170
});
194-
195171
});
196172

197-
describe('when set to \'reset\'', function() {
198-
var config = {
199-
doubleClick: 'reset'
200-
};
173+
it('when set to \'reset+autorange\' (the default) should autosize on 1st double click and reset on 2nd', function(done) {
174+
mockCopy = setRanges(mockCopy);
201175

202-
it('should work when \'autorange\' is on', function(done) {
203-
Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(function() {
176+
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function(){
177+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
178+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
179+
180+
doubleClick(blankPos[0], blankPos[1], function() {
204181
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
205182
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
206183

207-
Plotly.relayout(gd, update).then(function() {
208-
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
209-
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
210-
211-
doubleClick(blankPos[0], blankPos[1], function() {
212-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
213-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
184+
doubleClick(blankPos[0], blankPos[1], function() {
185+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
186+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
214187

215-
done();
216-
});
188+
done();
217189
});
218190
});
219191
});
192+
});
220193

221-
it('should reset to set range on double click', function(done) {
222-
mockCopy = setRanges(mockCopy);
223-
224-
Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(function() {
225-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
226-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
194+
it('when set to \'reset\' should work when \'autorange\' is on', function(done) {
195+
Plotly.plot(gd, mockCopy.data, mockCopy.layout, { doubleClick: 'reset' }).then(function() {
196+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
197+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
227198

228-
Plotly.relayout(gd, update).then(function() {
229-
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
230-
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
199+
Plotly.relayout(gd, update).then(function() {
200+
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
201+
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
231202

232-
doubleClick(blankPos[0], blankPos[1], function() {
233-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
234-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
203+
doubleClick(blankPos[0], blankPos[1], function() {
204+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
205+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
235206

236-
done();
237-
});
207+
done();
238208
});
239209
});
240210
});
211+
});
241212

242-
it('should reset on all double clicks', function(done) {
243-
mockCopy = setRanges(mockCopy);
213+
it('when set to \'reset\' should reset to set range on double click', function(done) {
214+
mockCopy = setRanges(mockCopy);
244215

245-
Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(function() {
246-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
247-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
216+
Plotly.plot(gd, mockCopy.data, mockCopy.layout, { doubleClick: 'reset' }).then(function() {
217+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
218+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
219+
220+
Plotly.relayout(gd, update).then(function() {
221+
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
222+
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
248223

249224
doubleClick(blankPos[0], blankPos[1], function() {
250225
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
@@ -254,60 +229,53 @@ describe('click interactions', function() {
254229
});
255230
});
256231
});
257-
258232
});
259233

260-
describe('when set to \'autosize\'', function() {
261-
var config = {
262-
doubleClick: 'autosize'
263-
};
234+
it('when set to \'reset\' should reset on all double clicks', function(done) {
235+
mockCopy = setRanges(mockCopy);
264236

265-
it('should work when \'autorange\' is on', function(done) {
266-
Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(function() {
267-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
268-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
269-
270-
Plotly.relayout(gd, update).then(function() {
271-
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
272-
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
237+
Plotly.plot(gd, mockCopy.data, mockCopy.layout, { doubleClick: 'reset' }).then(function() {
238+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
239+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
273240

274-
doubleClick(blankPos[0], blankPos[1], function() {
275-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
276-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
241+
doubleClick(blankPos[0], blankPos[1], function() {
242+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
243+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
277244

278-
done();
279-
});
280-
});
245+
done();
281246
});
282247
});
248+
});
283249

284-
it('should set to autorange on double click', function(done) {
285-
mockCopy = setRanges(mockCopy);
250+
it('when set to \'autosize\' should work when \'autorange\' is on', function(done) {
251+
Plotly.plot(gd, mockCopy.data, mockCopy.layout, { doubleClick: 'autosize' }).then(function() {
252+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
253+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
286254

287-
Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(function() {
288-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
289-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
255+
Plotly.relayout(gd, update).then(function() {
256+
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
257+
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
290258

291-
Plotly.relayout(gd, update).then(function() {
292-
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
293-
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
294-
295-
doubleClick(blankPos[0], blankPos[1], function() {
296-
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
297-
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
259+
doubleClick(blankPos[0], blankPos[1], function() {
260+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
261+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
298262

299-
done();
300-
});
263+
done();
301264
});
302265
});
303266
});
267+
});
304268

305-
it('should reset on all double clicks', function(done) {
306-
mockCopy = setRanges(mockCopy);
269+
it('when set to \'autosize\' should set to autorange on double click', function(done) {
270+
mockCopy = setRanges(mockCopy);
307271

308-
Plotly.plot(gd, mockCopy.data, mockCopy.layout, config).then(function() {
309-
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
310-
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
272+
Plotly.plot(gd, mockCopy.data, mockCopy.layout, { doubleClick: 'autosize' }).then(function() {
273+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
274+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
275+
276+
Plotly.relayout(gd, update).then(function() {
277+
expect(gd.layout.xaxis.range).toBeCloseToArray(zoomRangeX);
278+
expect(gd.layout.yaxis.range).toBeCloseToArray(zoomRangeY);
311279

312280
doubleClick(blankPos[0], blankPos[1], function() {
313281
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
@@ -317,7 +285,22 @@ describe('click interactions', function() {
317285
});
318286
});
319287
});
288+
});
289+
290+
it('when set to \'autosize\' should reset on all double clicks', function(done) {
291+
mockCopy = setRanges(mockCopy);
292+
293+
Plotly.plot(gd, mockCopy.data, mockCopy.layout, { doubleClick: 'autosize' }).then(function() {
294+
expect(gd.layout.xaxis.range).toBeCloseToArray(setRangeX);
295+
expect(gd.layout.yaxis.range).toBeCloseToArray(setRangeY);
296+
297+
doubleClick(blankPos[0], blankPos[1], function() {
298+
expect(gd.layout.xaxis.range).toBeCloseToArray(autoRangeX);
299+
expect(gd.layout.yaxis.range).toBeCloseToArray(autoRangeY);
320300

301+
done();
302+
});
303+
});
321304
});
322305

323306
});

0 commit comments

Comments
 (0)