change ordering of spy creation to avoid overwrites (mapbox#839)

sergei-zelinsky · Nov 20, 2018 · 75a15d2 · 75a15d2
1 parent 578b817
commit 75a15d2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/test/direct_select.test.js b/test/direct_select.test.js
@@ -18,11 +18,12 @@ test('direct_select', t => {
   const mapContainer = document.createElement('div');
   document.body.appendChild(mapContainer);
   const map = createMap({ container: mapContainer });
-  spy(map, 'fire');
 
   const Draw = new MapboxDraw();
   map.addControl(Draw);
 
+  spy(map, 'fire');
+
   const afterNextRender = setupAfterNextRender(map);
 
   const cleanUp = function(cb) {

diff --git a/test/simple_select.test.js b/test/simple_select.test.js
@@ -16,15 +16,16 @@ test('simple_select', t => {
   const mapContainer = document.createElement('div');
   document.body.appendChild(mapContainer);
   const map = createMap({ container: mapContainer });
+
+  const Draw = new MapboxDraw();
+  map.addControl(Draw);
+
   spy(map, 'fire');
   spy(map.doubleClickZoom, 'enable');
   spy(map.doubleClickZoom, 'disable');
   spy(map.dragPan, 'enable');
   spy(map.dragPan, 'disable');
 
-  const Draw = new MapboxDraw();
-  map.addControl(Draw);
-
   const afterNextRender = setupAfterNextRender(map);
 
   const cleanUp = function(cb) {

diff --git a/test/static.test.js b/test/static.test.js
@@ -10,10 +10,6 @@ import createMap from './utils/create_map';
 test('static', t => {
 
   const map = createMap();
-  spy(map, 'fire');
-  map.dragPan.disable();
-  spy(map.dragPan, 'disable');
-
   const opts = {
     modes: {
       static: require('@mapbox/mapbox-gl-draw-static-mode')
@@ -23,6 +19,10 @@ test('static', t => {
   const Draw = new MapboxDraw(opts);
   map.addControl(Draw);
 
+  spy(map, 'fire');
+  map.dragPan.disable();
+  spy(map.dragPan, 'disable');
+
   const afterNextRender = setupAfterNextRender(map);
 
   const cleanUp = function(cb) {