Use blocked scoped variables
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
@@ -4,7 +4,7 @@ import CollectionEventType from '../../../src/ol/CollectionEventType.js';
|
||||
|
||||
|
||||
describe('ol.collection', function() {
|
||||
var collection;
|
||||
let collection;
|
||||
|
||||
beforeEach(function() {
|
||||
collection = new Collection();
|
||||
@@ -20,8 +20,8 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('create a collection from an array', function() {
|
||||
it('creates the expected collection', function() {
|
||||
var array = [0, 1, 2];
|
||||
var collection = new Collection(array);
|
||||
const array = [0, 1, 2];
|
||||
const collection = new Collection(array);
|
||||
expect(collection.item(0)).to.eql(0);
|
||||
expect(collection.item(1)).to.eql(1);
|
||||
expect(collection.item(2)).to.eql(2);
|
||||
@@ -30,13 +30,13 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('push to a collection', function() {
|
||||
it('adds elements to the collection', function() {
|
||||
var length = collection.push(1);
|
||||
const length = collection.push(1);
|
||||
expect(collection.getLength()).to.eql(length);
|
||||
expect(collection.getArray()).to.eql([1]);
|
||||
expect(collection.item(0)).to.eql(1);
|
||||
});
|
||||
it('returns the correct new length of the collection', function() {
|
||||
var length;
|
||||
let length;
|
||||
_ol_events_.listen(collection, 'add', function(event) {
|
||||
if (event.element === 'remove_me') {
|
||||
collection.remove(event.element);
|
||||
@@ -80,7 +80,7 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('removeAt', function() {
|
||||
it('removes elements at the correction', function() {
|
||||
var collection = new Collection([0, 1, 2]);
|
||||
const collection = new Collection([0, 1, 2]);
|
||||
collection.removeAt(1);
|
||||
expect(collection.item(0)).to.eql(0);
|
||||
expect(collection.item(1)).to.eql(2);
|
||||
@@ -88,7 +88,7 @@ describe('ol.collection', function() {
|
||||
});
|
||||
|
||||
describe('forEach', function() {
|
||||
var cb;
|
||||
let cb;
|
||||
beforeEach(function() {
|
||||
cb = sinon.spy();
|
||||
});
|
||||
@@ -110,27 +110,27 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('remove', function() {
|
||||
it('removes the first matching element', function() {
|
||||
var collection = new Collection([0, 1, 2]);
|
||||
const collection = new Collection([0, 1, 2]);
|
||||
expect(collection.remove(1)).to.eql(1);
|
||||
expect(collection.getArray()).to.eql([0, 2]);
|
||||
expect(collection.getLength()).to.eql(2);
|
||||
});
|
||||
it('fires a remove event', function() {
|
||||
var collection = new Collection([0, 1, 2]);
|
||||
var cb = sinon.spy();
|
||||
const collection = new Collection([0, 1, 2]);
|
||||
const cb = sinon.spy();
|
||||
_ol_events_.listen(collection, CollectionEventType.REMOVE, cb);
|
||||
expect(collection.remove(1)).to.eql(1);
|
||||
expect(cb).to.be.called();
|
||||
expect(cb.lastCall.args[0].element).to.eql(1);
|
||||
});
|
||||
it('does not remove more than one matching element', function() {
|
||||
var collection = new Collection([0, 1, 1, 2]);
|
||||
const collection = new Collection([0, 1, 1, 2]);
|
||||
expect(collection.remove(1)).to.eql(1);
|
||||
expect(collection.getArray()).to.eql([0, 1, 2]);
|
||||
expect(collection.getLength()).to.eql(3);
|
||||
});
|
||||
it('returns undefined if the element is not found', function() {
|
||||
var collection = new Collection([0, 1, 2]);
|
||||
const collection = new Collection([0, 1, 2]);
|
||||
expect(collection.remove(3)).to.be(undefined);
|
||||
expect(collection.getArray()).to.eql([0, 1, 2]);
|
||||
expect(collection.getLength()).to.eql(3);
|
||||
@@ -139,15 +139,15 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('setAt and event', function() {
|
||||
it('does dispatch events', function() {
|
||||
var collection = new Collection(['a', 'b']);
|
||||
var added, removed;
|
||||
const collection = new Collection(['a', 'b']);
|
||||
let added, removed;
|
||||
_ol_events_.listen(collection, CollectionEventType.ADD, function(e) {
|
||||
added = e.element;
|
||||
});
|
||||
_ol_events_.listen(
|
||||
collection, CollectionEventType.REMOVE, function(e) {
|
||||
removed = e.element;
|
||||
});
|
||||
collection, CollectionEventType.REMOVE, function(e) {
|
||||
removed = e.element;
|
||||
});
|
||||
collection.setAt(1, 1);
|
||||
expect(added).to.eql(1);
|
||||
expect(removed).to.eql('b');
|
||||
@@ -156,12 +156,12 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('removeAt and event', function() {
|
||||
it('does dispatch events', function() {
|
||||
var collection = new Collection(['a']);
|
||||
var removed;
|
||||
const collection = new Collection(['a']);
|
||||
let removed;
|
||||
_ol_events_.listen(
|
||||
collection, CollectionEventType.REMOVE, function(e) {
|
||||
removed = e.element;
|
||||
});
|
||||
collection, CollectionEventType.REMOVE, function(e) {
|
||||
removed = e.element;
|
||||
});
|
||||
collection.pop();
|
||||
expect(removed).to.eql('a');
|
||||
});
|
||||
@@ -169,12 +169,12 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('insertAt and event', function() {
|
||||
it('does dispatch events', function() {
|
||||
var collection = new Collection([0, 2]);
|
||||
var added;
|
||||
const collection = new Collection([0, 2]);
|
||||
let added;
|
||||
_ol_events_.listen(
|
||||
collection, CollectionEventType.ADD, function(e) {
|
||||
added = e.element;
|
||||
});
|
||||
collection, CollectionEventType.ADD, function(e) {
|
||||
added = e.element;
|
||||
});
|
||||
collection.insertAt(1, 1);
|
||||
expect(added).to.eql(1);
|
||||
});
|
||||
@@ -182,11 +182,11 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('setAt beyond end', function() {
|
||||
it('triggers events properly', function() {
|
||||
var added = [];
|
||||
const added = [];
|
||||
_ol_events_.listen(
|
||||
collection, CollectionEventType.ADD, function(e) {
|
||||
added.push(e.element);
|
||||
});
|
||||
collection, CollectionEventType.ADD, function(e) {
|
||||
added.push(e.element);
|
||||
});
|
||||
collection.setAt(2, 0);
|
||||
expect(collection.getLength()).to.eql(3);
|
||||
expect(collection.item(0)).to.be(undefined);
|
||||
@@ -200,7 +200,7 @@ describe('ol.collection', function() {
|
||||
});
|
||||
|
||||
describe('change:length event', function() {
|
||||
var collection, cb;
|
||||
let collection, cb;
|
||||
beforeEach(function() {
|
||||
collection = new Collection([0, 1, 2]);
|
||||
cb = sinon.spy();
|
||||
@@ -231,18 +231,18 @@ describe('ol.collection', function() {
|
||||
|
||||
describe('add event', function() {
|
||||
it('triggers add when pushing', function() {
|
||||
var collection = new Collection();
|
||||
var elem;
|
||||
const collection = new Collection();
|
||||
let elem;
|
||||
_ol_events_.listen(collection, CollectionEventType.ADD, function(e) {
|
||||
elem = e.element;
|
||||
});
|
||||
var length = collection.push(1);
|
||||
const length = collection.push(1);
|
||||
expect(elem).to.eql(length);
|
||||
});
|
||||
});
|
||||
|
||||
describe('remove event', function() {
|
||||
var collection, cb1, cb2;
|
||||
let collection, cb1, cb2;
|
||||
beforeEach(function() {
|
||||
collection = new Collection([1]);
|
||||
cb1 = sinon.spy();
|
||||
@@ -275,8 +275,8 @@ describe('ol.collection', function() {
|
||||
expect(collection.item(1)).to.eql(2);
|
||||
});
|
||||
it('fires events', function() {
|
||||
var collection = new Collection();
|
||||
var elems = [];
|
||||
const collection = new Collection();
|
||||
const elems = [];
|
||||
_ol_events_.listen(collection, CollectionEventType.ADD, function(e) {
|
||||
elems.push(e.element);
|
||||
});
|
||||
@@ -291,63 +291,63 @@ describe('ol.collection', function() {
|
||||
});
|
||||
|
||||
it('throws if duplicate items are passed to the constructor', function() {
|
||||
var item = {};
|
||||
var call = function() {
|
||||
const item = {};
|
||||
const call = function() {
|
||||
new Collection([item, item], {unique: true});
|
||||
};
|
||||
expect(call).to.throwException();
|
||||
});
|
||||
|
||||
it('allows unique items to be added via push', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
unique.push({});
|
||||
unique.push({});
|
||||
});
|
||||
|
||||
it('throws if duplicate items are added via push', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
var item = {};
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
const item = {};
|
||||
unique.push(item);
|
||||
var call = function() {
|
||||
const call = function() {
|
||||
unique.push(item);
|
||||
};
|
||||
expect(call).to.throwException();
|
||||
});
|
||||
|
||||
it('allows unique items to be added via insertAt', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
unique.insertAt(0, {});
|
||||
unique.insertAt(0, {});
|
||||
});
|
||||
|
||||
it('throws if duplicate items are added via insertAt', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
var item = {};
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
const item = {};
|
||||
unique.insertAt(0, item);
|
||||
var call = function() {
|
||||
const call = function() {
|
||||
unique.insertAt(0, item);
|
||||
};
|
||||
expect(call).to.throwException();
|
||||
});
|
||||
|
||||
it('allows unique items to be added via setAt', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
unique.setAt(0, {});
|
||||
unique.setAt(1, {});
|
||||
});
|
||||
|
||||
it('allows items to be reset via setAt', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
var item = {};
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
const item = {};
|
||||
unique.setAt(0, item);
|
||||
unique.setAt(0, item);
|
||||
});
|
||||
|
||||
it('throws if duplicate items are added via setAt', function() {
|
||||
var unique = new Collection(undefined, {unique: true});
|
||||
var item = {};
|
||||
const unique = new Collection(undefined, {unique: true});
|
||||
const item = {};
|
||||
unique.setAt(0, item);
|
||||
var call = function() {
|
||||
const call = function() {
|
||||
unique.setAt(1, item);
|
||||
};
|
||||
expect(call).to.throwException();
|
||||
|
||||
Reference in New Issue
Block a user