From 970448effc0bdaffa3fb40ca7c4115e98e2901d8 Mon Sep 17 00:00:00 2001 From: tschaub Date: Wed, 8 Aug 2012 11:41:51 -0600 Subject: [PATCH] Tests for response property on loadend event. This confirms that the loadend event includes a response property when it results from a call to the strategy merge method (see #624). --- tests/Strategy/BBOX.html | 7 +++++-- tests/Strategy/Fixed.html | 9 ++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/tests/Strategy/BBOX.html b/tests/Strategy/BBOX.html index a36f24c6dc..b89e5568cf 100644 --- a/tests/Strategy/BBOX.html +++ b/tests/Strategy/BBOX.html @@ -112,16 +112,18 @@ function test_events(t) { - t.plan(5); + t.plan(6); var log = []; + var response = new OpenLayers.Protocol.Response(); + var map = new OpenLayers.Map("map"); var layer = new OpenLayers.Layer.Vector(null, { strategies: [new OpenLayers.Strategy.BBOX()], protocol: new OpenLayers.Protocol({ read: function(config) { - config.callback.call(config.scope, {}); + config.callback.call(config.scope, response); } }), isBaseLayer: true, @@ -140,6 +142,7 @@ t.eq(log.length, 2, "2 events logged"); t.eq(log[0].type, "loadstart", "loadstart first"); t.eq(log[1].type, "loadend", "loadend second"); + t.ok(log[1].response == response, "loadend includes response"); var calls = []; layer.protocol.read = function(obj) { diff --git a/tests/Strategy/Fixed.html b/tests/Strategy/Fixed.html index 2312a416f3..2f9f5b3adc 100644 --- a/tests/Strategy/Fixed.html +++ b/tests/Strategy/Fixed.html @@ -62,16 +62,18 @@ function test_events(t) { - t.plan(5); + t.plan(6); var log = []; + + var response = new OpenLayers.Protocol.Response(); var map = new OpenLayers.Map("map"); var layer = new OpenLayers.Layer.Vector(null, { strategies: [new OpenLayers.Strategy.Fixed()], protocol: new OpenLayers.Protocol({ read: function(config) { - config.callback.call(config.scope, {}); + config.callback.call(config.scope, response); } }), isBaseLayer: true, @@ -87,10 +89,11 @@ map.addLayer(layer); map.zoomToMaxExtent(); - + t.eq(log.length, 2, "2 events logged"); t.eq(log[0].type, "loadstart", "loadstart first"); t.eq(log[1].type, "loadend", "loadend second"); + t.ok(log[1].response == response, "loadend includes response"); var calls = []; layer.protocol.read = function(obj) {