Merge branch '2.12'

tests/Layer/HTTPRequest.html

@@ -68,7 +68,7 @@
     }
 
     function test_Layer_HTTPRequest_mergeNewParams (t) {
-        t.plan( 9 );
+        t.plan( 8 );
 
         var map = new OpenLayers.Map('map');
         layer = new OpenLayers.Layer.HTTPRequest(name, url, params, options);
@@ -100,9 +100,7 @@
         
         layer.redraw = function() {
             t.ok(true, "layer.mergeNewParams calls layer.redraw");
-            t.ok(layer.resolution === null, "layer.mergeNewParams sets resolution to null");
-        };
-        layer.resolution = 'fake';
+        }
         layer.mergeNewParams();
     }
 

tests/Layer/Vector.html

@@ -869,32 +869,7 @@
             "featuresadded event received expected number of features");
     }
 
-    function test_redraw(t) {
-        t.plan(2);
 
-        // test that when redraw is called on a vector layer then
-        // moveTo gets called on the layer and receives zoomChanged
-        // true
-
-        var log = [];
-
-        var map = new OpenLayers.Map("map");
-        var layer = new OpenLayers.Layer.Vector("vector", {isBaseLayer: true});
-        map.addLayer(layer);
-        map.setCenter([0, 0], 5);
-
-        layer.moveTo = function(extent, zoomChanged) {
-            log.push(zoomChanged);
-        };
-
-        layer.redraw();
-        t.eq(log.length, 1, "redraw makes moveTo be called once");
-        if (log.length == 1) {
-            t.eq(log[0], true, "redraw makes moveTo be called with zoomChanged true");
-        }
-
-        map.destroy();
-    }
 
   </script>
 </head>