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

Use blocked scoped variables

Browse Source 
In addition to using const and let, this also upgrades our linter config and removes lint (mostly whitespace).
This commit is contained in:
Tim Schaub
2018-01-11 23:32:36 -07:00
parent 0bf2b04dee
commit ad62739a6e
684 changed files with 18120 additions and 18184 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/ol/layer/layer.test.js
+37 -37
View File
@@ -10,7 +10,7 @@ describe('ol.layer.Layer', function() {
describe('constructor (defaults)', function() {
var layer;
let layer;
beforeEach(function() {
layer = new Layer({
@@ -63,7 +63,7 @@ describe('ol.layer.Layer', function() {
describe('constructor (options)', function() {
it('accepts options', function() {
var layer = new Layer({
const layer = new Layer({
source: new Source({
projection: getProjection('EPSG:4326')
}),
@@ -98,7 +98,7 @@ describe('ol.layer.Layer', function() {
});
describe('visibleAtResolution', function() {
var layer;
let layer;
beforeEach(function() {
layer = new Layer({
@@ -116,7 +116,7 @@ describe('ol.layer.Layer', function() {
layer.setVisible(false);
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
const layerState = layer.getLayerState();
expect(Layer.visibleAtResolution(layerState, 4)).to.be(false);
});
@@ -124,7 +124,7 @@ describe('ol.layer.Layer', function() {
layer.setVisible(true);
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
const layerState = layer.getLayerState();
expect(Layer.visibleAtResolution(layerState, 2)).to.be(false);
});
@@ -132,7 +132,7 @@ describe('ol.layer.Layer', function() {
layer.setVisible(true);
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
const layerState = layer.getLayerState();
expect(Layer.visibleAtResolution(layerState, 6)).to.be(false);
});
@@ -140,7 +140,7 @@ describe('ol.layer.Layer', function() {
layer.setVisible(true);
layer.setMinResolution(3);
layer.setMaxResolution(5);
var layerState = layer.getLayerState();
const layerState = layer.getLayerState();
expect(Layer.visibleAtResolution(layerState, 4)).to.be(true);
});
@@ -148,7 +148,7 @@ describe('ol.layer.Layer', function() {
describe('#getLayerState', function() {
var layer;
let layer;
beforeEach(function() {
layer = new Layer({
@@ -216,33 +216,33 @@ describe('ol.layer.Layer', function() {
describe('#getSource', function() {
it('gets the layer source', function() {
var source = new Source({projection: getProjection('EPSG:4326')});
var layer = new Layer({source: source});
const source = new Source({projection: getProjection('EPSG:4326')});
const layer = new Layer({source: source});
expect(layer.getSource()).to.be(source);
});
});
describe('#set("source", source)', function() {
var projection = getProjection('EPSG:4326');
const projection = getProjection('EPSG:4326');
it('sets the layer source', function() {
var layer = new Layer({
const layer = new Layer({
source: new Source({projection: projection})
});
var source = new Source({projection: projection});
const source = new Source({projection: projection});
layer.set('source', source);
expect(layer.getSource()).to.be(source);
});
it('calls changed', function() {
var layer = new Layer({
const layer = new Layer({
source: new Source({projection: projection})
});
sinon.spy(layer, 'changed');
var source = new Source({projection: projection});
const source = new Source({projection: projection});
layer.set('source', source);
expect(layer.changed.calledOnce).to.be(true);
});
@@ -250,13 +250,13 @@ describe('ol.layer.Layer', function() {
it('sets up event listeners', function() {
sinon.spy(Layer.prototype, 'handleSourceChange_');
var first = new Source({projection: projection});
var layer = new Layer({source: first});
const first = new Source({projection: projection});
const layer = new Layer({source: first});
first.setState('ready');
expect(layer.handleSourceChange_.calledOnce).to.be(true);
var second = new Source({projection: projection});
const second = new Source({projection: projection});
layer.set('source', second);
expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -270,25 +270,25 @@ describe('ol.layer.Layer', function() {
});
describe('#setSource()', function() {
var projection = getProjection('EPSG:4326');
const projection = getProjection('EPSG:4326');
it('sets the layer source', function() {
var layer = new Layer({
const layer = new Layer({
source: new Source({projection: projection})
});
var source = new Source({projection: projection});
const source = new Source({projection: projection});
layer.setSource(source);
expect(layer.getSource()).to.be(source);
});
it('calls changed', function() {
var layer = new Layer({
const layer = new Layer({
source: new Source({projection: projection})
});
sinon.spy(layer, 'changed');
var source = new Source({projection: projection});
const source = new Source({projection: projection});
layer.setSource(source);
expect(layer.changed.calledOnce).to.be(true);
});
@@ -296,13 +296,13 @@ describe('ol.layer.Layer', function() {
it('sets up event listeners', function() {
sinon.spy(Layer.prototype, 'handleSourceChange_');
var first = new Source({projection: projection});
var layer = new Layer({source: first});
const first = new Source({projection: projection});
const layer = new Layer({source: first});
first.setState('ready');
expect(layer.handleSourceChange_.calledOnce).to.be(true);
var second = new Source({projection: projection});
const second = new Source({projection: projection});
layer.setSource(second);
expect(layer.handleSourceChange_.calledOnce).to.be(true);
@@ -318,7 +318,7 @@ describe('ol.layer.Layer', function() {
describe('#setOpacity', function() {
var layer;
let layer;
beforeEach(function() {
layer = new Layer({
@@ -338,7 +338,7 @@ describe('ol.layer.Layer', function() {
});
it('triggers a change event', function() {
var listener = sinon.spy();
const listener = sinon.spy();
layer.on('propertychange', listener);
layer.setOpacity(0.4);
expect(listener.calledOnce).to.be(true);
@@ -349,7 +349,7 @@ describe('ol.layer.Layer', function() {
describe('#setVisible', function() {
var layer;
let layer;
beforeEach(function() {
layer = new Layer({
source: new Source({
@@ -371,7 +371,7 @@ describe('ol.layer.Layer', function() {
});
it('fires a change event', function() {
var listener = sinon.spy();
const listener = sinon.spy();
layer.on('propertychange', listener);
layer.setVisible(false);
@@ -384,7 +384,7 @@ describe('ol.layer.Layer', function() {
});
describe('#setMap (unmanaged layer)', function() {
var map;
let map;
beforeEach(function() {
map = new Map({});
@@ -392,24 +392,24 @@ describe('ol.layer.Layer', function() {
describe('with map in constructor options', function() {
it('renders the layer', function() {
var layer = new Layer({
const layer = new Layer({
map: map
});
var frameState = {
const frameState = {
layerStatesArray: [],
layerStates: {}
};
map.dispatchEvent(new RenderEvent('precompose', null,
frameState, null, null));
frameState, null, null));
expect(frameState.layerStatesArray.length).to.be(1);
var layerState = frameState.layerStatesArray[0];
const layerState = frameState.layerStatesArray[0];
expect(layerState.layer).to.equal(layer);
expect(frameState.layerStates[getUid(layer)]).to.equal(layerState);
});
});
describe('setMap sequences', function() {
var mapRenderSpy;
let mapRenderSpy;
beforeEach(function() {
mapRenderSpy = sinon.spy(map, 'render');
@@ -420,7 +420,7 @@ describe('ol.layer.Layer', function() {
});
it('requests a render frame', function() {
var layer = new Layer({});
const layer = new Layer({});
layer.setMap(map);
expect(mapRenderSpy.callCount).to.be(1);