From a54a308983a10b4d16b49e8ca550a7846f1fb857 Mon Sep 17 00:00:00 2001 From: Rob Jackson Date: Tue, 4 Oct 2022 10:38:27 +0100 Subject: [PATCH] Speed up tests Map.ScrollWheelZoomSpec and Map.DoubleClickZoomSpec (#8519) --- spec/suites/map/handler/Map.DoubleClickZoomSpec.js | 12 ++++++++---- spec/suites/map/handler/Map.ScrollWheelZoomSpec.js | 3 ++- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/spec/suites/map/handler/Map.DoubleClickZoomSpec.js b/spec/suites/map/handler/Map.DoubleClickZoomSpec.js index fc2068fd31e..b2ebf4c4287 100644 --- a/spec/suites/map/handler/Map.DoubleClickZoomSpec.js +++ b/spec/suites/map/handler/Map.DoubleClickZoomSpec.js @@ -5,7 +5,8 @@ describe("Map.DoubleClickZoom", function () { container = createContainer(); map = L.map(container, { center: [0, 0], - zoom: 3 + zoom: 3, + zoomAnimation: false }); }); @@ -15,31 +16,32 @@ describe("Map.DoubleClickZoom", function () { it("zooms in while dblclick", function (done) { var zoom = map.getZoom(); - happen.dblclick(container); map.on('zoomend', function () { expect(map.getCenter()).to.be.nearLatLng([17.308687886770034, -17.578125000000004]); expect(map.getZoom()).to.be.greaterThan(zoom); done(); }); + + happen.dblclick(container); }); it("zooms out while dblclick and holding shift", function (done) { var zoom = map.getZoom(); - happen.dblclick(container, {shiftKey: true}); map.on('zoomend', function () { expect(map.getCenter()).to.be.nearLatLng([-33.137551192346145, 35.15625000000001]); expect(map.getZoom()).to.be.lessThan(zoom); done(); }); + + happen.dblclick(container, {shiftKey: true}); }); it("doubleClickZoom: 'center'", function (done) { var doubleClickZoomBefore = map.options.doubleClickZoom; map.options.doubleClickZoom = 'center'; var zoom = map.getZoom(); - happen.dblclick(container); map.on('zoomend', function () { expect(map.getCenter()).to.be.nearLatLng([0, 0]); @@ -47,6 +49,8 @@ describe("Map.DoubleClickZoom", function () { map.options.doubleClickZoom = doubleClickZoomBefore; done(); }); + + happen.dblclick(container); }); }); diff --git a/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js b/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js index 8eb10d1c903..a8f16d72a69 100644 --- a/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js +++ b/spec/suites/map/handler/Map.ScrollWheelZoomSpec.js @@ -16,7 +16,8 @@ describe("Map.ScrollWheelZoom", function () { container = createContainer(); map = L.map(container, { center: [0, 0], - zoom: 3 + zoom: 3, + zoomAnimation: false }); });