From 7fde4a48f42243424ae42d3c9c11b4ec17a75044 Mon Sep 17 00:00:00 2001
From: Tim Schaub <tim.schaub@gmail.com>
Date: Sun, 6 Nov 2016 15:00:39 -0700
Subject: [PATCH] Test that zoom is preferred over resolution

---
 test/spec/ol/view.test.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/test/spec/ol/view.test.js b/test/spec/ol/view.test.js
index ba10e3019b..cf5d4dacba 100644
--- a/test/spec/ol/view.test.js
+++ b/test/spec/ol/view.test.js
@@ -340,6 +340,23 @@ describe('ol.View', function() {
       }, 50);
     });
 
+    it('prefers zoom over resolution', function(done) {
+      var view = new ol.View({
+        center: [0, 0],
+        zoom: 5
+      });
+
+      view.animate({
+        zoom: 4,
+        resolution: view.getResolution() * 3,
+        duration: 25
+      }, function(complete) {
+        expect(complete).to.be(true);
+        expect(view.getZoom()).to.be(4);
+        done();
+      });
+    });
+
     it('calls a callback when animation completes', function(done) {
       var view = new ol.View({
         center: [0, 0],