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

Merge pull request #7578 from tschaub/undeprecated

Browse Source 
Remove deprecated functionality from 4.x
This commit is contained in:
Tim Schaub
2017-12-13 05:31:51 -07:00
committed by GitHub
parent 37b849a059 453ddd76b3
commit 6e6b0b08fb
18 changed files with 52 additions and 980 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/spec/ol/deviceorientation.test.js
View File

@@ -1,15 +0,0 @@
import _ol_DeviceOrientation_ from '../../../src/ol/DeviceOrientation.js';
describe('ol.DeviceOrientation', function() {
describe('constructor', function() {
it('can be constructed without arguments', function() {
var instance = new _ol_DeviceOrientation_();
expect(instance).to.be.an(_ol_DeviceOrientation_);
});
});
});

70
test/spec/ol/source/source.test.js
View File

@@ -1,4 +1,3 @@
import _ol_Attribution_ from '../../../../src/ol/Attribution.js';
import _ol_proj_ from '../../../../src/ol/proj.js';
import _ol_source_Source_ from '../../../../src/ol/source/Source.js';
@@ -17,7 +16,7 @@ describe('ol.source.Source', function() {
describe('config option `attributions`', function() {
it('accepts undefined', function() {
var source = new _ol_source_Source_({});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.be(null);
});
@@ -25,7 +24,7 @@ describe('ol.source.Source', function() {
var source = new _ol_source_Source_({
attributions: 'Humpty'
});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql(['Humpty']);
@@ -35,7 +34,7 @@ describe('ol.source.Source', function() {
var source = new _ol_source_Source_({
attributions: ['Humpty', 'Dumpty']
});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql(['Humpty', 'Dumpty']);
@@ -47,7 +46,7 @@ describe('ol.source.Source', function() {
return 'Humpty';
}
});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.be('Humpty');
@@ -59,7 +58,7 @@ describe('ol.source.Source', function() {
return ['Humpty', 'Dumpty'];
}
});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql(['Humpty', 'Dumpty']);
@@ -78,55 +77,6 @@ describe('ol.source.Source', function() {
});
});
describe('#getAttributions()', function() {
it('maintains backwards compatibility for string option', function() {
var source = new _ol_source_Source_({
attributions: 'foo'
});
var attributions = source.getAttributions();
expect(attributions.length).to.be(1);
expect(attributions[0]).to.be.an(_ol_Attribution_);
expect(attributions[0].getHTML()).to.be('foo');
});
it('maintains backwards compatibility for array of strings option', function() {
var source = new _ol_source_Source_({
attributions: ['foo', 'bar']
});
var attributions = source.getAttributions();
expect(attributions.length).to.be(2);
expect(attributions[0]).to.be.an(_ol_Attribution_);
expect(attributions[0].getHTML()).to.be('foo');
expect(attributions[1]).to.be.an(_ol_Attribution_);
expect(attributions[1].getHTML()).to.be('bar');
});
it('maintains backwards compatibility for ol.Attribution option', function() {
var source = new _ol_source_Source_({
attributions: new _ol_Attribution_({html: 'foo'})
});
var attributions = source.getAttributions();
expect(attributions.length).to.be(1);
expect(attributions[0]).to.be.an(_ol_Attribution_);
expect(attributions[0].getHTML()).to.be('foo');
});
it('maintains backwards compatibility for array of strings option', function() {
var source = new _ol_source_Source_({
attributions: [
new _ol_Attribution_({html: 'foo'}),
new _ol_Attribution_({html: 'bar'})
]
});
var attributions = source.getAttributions();
expect(attributions.length).to.be(2);
expect(attributions[0]).to.be.an(_ol_Attribution_);
expect(attributions[0].getHTML()).to.be('foo');
expect(attributions[1]).to.be.an(_ol_Attribution_);
expect(attributions[1].getHTML()).to.be('bar');
});
});
describe('#setAttributions()', function() {
var source = null;
@@ -142,13 +92,13 @@ describe('ol.source.Source', function() {
it('accepts undefined', function() {
source.setAttributions();
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.be(null);
});
it('accepts a single string', function() {
source.setAttributions('Humpty');
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql(['Humpty']);
@@ -156,7 +106,7 @@ describe('ol.source.Source', function() {
it('accepts an array of strings', function() {
source.setAttributions(['Humpty', 'Dumpty']);
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql(['Humpty', 'Dumpty']);
@@ -166,7 +116,7 @@ describe('ol.source.Source', function() {
source.setAttributions(function() {
return 'Humpty';
});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql('Humpty');
@@ -176,7 +126,7 @@ describe('ol.source.Source', function() {
source.setAttributions(function() {
return ['Humpty', 'Dumpty'];
});
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
expect(attributions()).to.eql(['Humpty', 'Dumpty']);

4
test/spec/ol/source/tileutfgrid.test.js
View File

@@ -163,13 +163,13 @@ describe('ol.source.TileUTFGrid', function() {
it('sets up correct attribution', function() {
var source = getTileUTFGrid();
expect(source.getAttributions2()).to.be(null);
expect(source.getAttributions()).to.be(null);
// call the handleTileJSONResponse method with our
// locally available tileJson (from `before`)
source.handleTileJSONResponse(tileJson);
var attributions = source.getAttributions2();
var attributions = source.getAttributions();
expect(attributions).to.not.be(null);
expect(typeof attributions).to.be('function');
});