Use more consistent variable names and reduce findListener_ calls

This commit is contained in:
Andreas Hocevar
2016-02-02 22:57:38 +01:00
parent f3b97d6bef
commit 7a8d15fe47
2 changed files with 46 additions and 31 deletions

View File

@@ -46,25 +46,35 @@ describe('ol.events', function() {
});
describe('findListener_()', function() {
it('searches a listener array for a specific listener', function() {
var bindTo = {id: 1};
var listener = function() {};
var listenerObj = {
var listener, listenerObj, listeners;
beforeEach(function() {
listener = function() {};
listenerObj = {
type: 'foo',
target: target,
listener: listener
};
var listenerArray = [listenerObj];
var result = ol.events.findListener_(listenerArray, listener);
listeners = [listenerObj];
});
it('searches a listener array for a specific listener', function() {
var bindTo = {id: 1};
var result = ol.events.findListener_(listeners, listener);
expect(result).to.be(listenerObj);
result = ol.events.findListener_(listenerArray, listener, bindTo);
result = ol.events.findListener_(listeners, listener, bindTo);
expect(result).to.be(undefined);
listenerObj.bindTo = bindTo;
result = ol.events.findListener_(listenerArray, listener);
result = ol.events.findListener_(listeners, listener);
expect(result).to.be(undefined);
result = ol.events.findListener_(listenerArray, listener, bindTo);
result = ol.events.findListener_(listeners, listener, bindTo);
expect(result).to.be(listenerObj);
});
it('marks the delete index on a listener object', function() {
var result = ol.events.findListener_(listeners, listener, undefined, true);
expect(result).to.be(listenerObj);
expect(listenerObj.deleteIndex).to.be(0);
});
});
describe('getListeners()', function() {