ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Named exports from ol/net

Browse Source
This commit is contained in:
Tim Schaub
2018-02-07 11:35:05 -07:00
parent 3266ffc58f
commit cd9b06135f
6 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/spec/ol/net.test.js
View File

@@ -1,5 +1,5 @@
import {getUid} from '../../../src/ol/index.js';
import _ol_net_ from '../../../src/ol/net.js';
import {jsonp as requestJSONP} from '../../../src/ol/net.js';
describe('ol.net', function() {
@@ -54,11 +54,11 @@ describe('ol.net', function() {
});
it('appends callback param to url, cleans up after call', function(done) {
_ol_net_.jsonp('foo', createCallback('foo?callback=', done));
requestJSONP('foo', createCallback('foo?callback=', done));
});
it('appends correct callback param to a url with query', function(done) {
const callback = createCallback('http://foo/bar?baz&callback=', done);
_ol_net_.jsonp('http://foo/bar?baz', callback);
requestJSONP('http://foo/bar?baz', callback);
});
it('calls errback when jsonp is not executed, cleans up', function(done) {
head.appendChild = function(element) {
@@ -74,11 +74,11 @@ describe('ol.net', function() {
expect(removeChild.called).to.be(true);
done();
}
_ol_net_.jsonp('foo', callback, errback);
requestJSONP('foo', callback, errback);
});
it('accepts a custom callback param', function(done) {
const callback = createCallback('foo?mycallback=', done);
_ol_net_.jsonp('foo', callback, undefined, 'mycallback');
requestJSONP('foo', callback, undefined, 'mycallback');
});
});

20
test/spec/ol/source/bingmaps.test.js
View File

@@ -1,4 +1,3 @@
import _ol_net_ from '../../../../src/ol/net.js';
import BingMaps from '../../../../src/ol/source/BingMaps.js';
import _ol_tilecoord_ from '../../../../src/ol/tilecoord.js';
import Observable from '../../../../src/ol/Observable.js';
@@ -11,21 +10,18 @@ describe('ol.source.BingMaps', function() {
let source, tileGrid;
beforeEach(function(done) {
const olNetJsonp = _ol_net_.jsonp;
// mock ol.net.Jsonp (used in the ol.source.TileJSON constructor)
_ol_net_.jsonp = function(url, callback) {
const client = new XMLHttpRequest();
client.open('GET', 'spec/ol/data/bing_aerialwithlabels.json', true);
client.onload = function() {
callback(JSON.parse(client.responseText));
};
client.send();
};
source = new BingMaps({
imagerySet: 'AerialWithLabels',
key: ''
});
_ol_net_.jsonp = olNetJsonp;
const client = new XMLHttpRequest();
client.open('GET', 'spec/ol/data/bing_aerialwithlabels.json', true);
client.onload = function() {
source.handleImageryMetadataResponse(JSON.parse(client.responseText));
};
client.send();
const key = source.on('change', function() {
if (source.getState() === 'ready') {
Observable.unByKey(key);