#313 rebase post-merge change

plotly · Apr 17, 2016 · 1c6014a · 1c6014a
1 parent 92a7c90
commit 1c6014a
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/test/jasmine/tests/click_test.js b/test/jasmine/tests/click_test.js
@@ -96,15 +96,14 @@ describe('Test click interactions:', function() {
         });
     });
 
-    describe('click events with hoverinfo set to none', function() {
+    describe('click event with hoverinfo set to none - plotly_click', function() {
         var futureData;
 
         beforeEach(function(done) {
-            gd = createGraphDiv();
 
-            var mockCopy = Lib.extendDeep({}, mock);
-            mockCopy.data[0].hoverinfo = 'none';
-            Plotly.plot(gd, mockCopy.data, mockCopy.layout)
+            var modifiedMockCopy = Lib.extendDeep({}, mockCopy);
+            modifiedMockCopy.data[0].hoverinfo = 'none';
+            Plotly.plot(gd, modifiedMockCopy.data, modifiedMockCopy.layout)
                 .then(done);
 
             gd.on('plotly_click', function(data) {
@@ -128,15 +127,14 @@ describe('Test click interactions:', function() {
         });
     });
 
-    describe('click events with hoverinfo set to none', function() {
+    describe('click events with hoverinfo set to none - plotly_hover', function() {
         var futureData;
 
         beforeEach(function(done) {
-            gd = createGraphDiv();
 
-            var mockCopy = Lib.extendDeep({}, mock);
-            mockCopy.data[0].hoverinfo = 'none';
-            Plotly.plot(gd, mockCopy.data, mockCopy.layout)
+            var modifiedMockCopy = Lib.extendDeep({}, mockCopy);
+            modifiedMockCopy.data[0].hoverinfo = 'none';
+            Plotly.plot(gd, modifiedMockCopy.data, modifiedMockCopy.layout)
                 .then(done);
 
             gd.on('plotly_hover', function(data) {

diff --git a/test/jasmine/tests/gl_plot_interact_test.js b/test/jasmine/tests/gl_plot_interact_test.js
@@ -52,6 +52,7 @@ describe('Test gl plot interactions', function() {
         destroyGraphDiv();
     });
 
+    // put callback in the event queue
     function delay(done) {
         setTimeout(done, 0);
     }