leaflet-js 0.6.beta4 → 0.7.0

data/lib/leaflet/spec/karma.conf.js

@@ -1,64 +1,65 @@
 // Karma configuration
-var libSources = require(__dirname+'/../build/build.js').getFiles();
+module.exports = function (config) {
 
-// base path, that will be used to resolve files and exclude
-basePath = '';
+	var libSources = require(__dirname+'/../build/build.js').getFiles();
 
-for (var i=0; i < libSources.length; i++) {
-	libSources[i] = "../" + libSources[i];
-}
+	var files = [
+		"spec/before.js",
+		"spec/sinon.js",
+		"spec/expect.js"
+	].concat(libSources, [
+		"spec/after.js",
+		"node_modules/happen/happen.js",
+		"spec/suites/SpecHelper.js",
+		"spec/suites/**/*.js",
+		{pattern: "dist/images/*.png", included: false}
+	]);
 
-// list of files / patterns to load in the browser
-files = [].concat([
-	"../node_modules/mocha/mocha.js",
-	MOCHA_ADAPTER,
-	"before.js",
-	"sinon.js",
-	"expect.js"
-], libSources, [
-	"after.js",
-	"happen.js",
-	"suites/SpecHelper.js",
-	"suites/**/*.js"
-]);
+	config.set({
+		// base path, that will be used to resolve files and exclude
+		basePath: '../',
 
-// list of files to exclude
-exclude = [
-];
+		plugins: ['karma-mocha', 'karma-phantomjs-launcher', 'karma-chrome-launcher'],
 
-// test results reporter to use
-// possible values: 'dots', 'progress', 'junit'
-reporters = ['dots'];
+		// frameworks to use
+		frameworks: ['mocha'],
 
-// web server port
-port = 8080;
+		// list of files / patterns to load in the browser
+		files: files,
+		exclude: [],
 
-// cli runner port
-runnerPort = 9100;
+		// test results reporter to use
+		// possible values: 'dots', 'progress', 'junit', 'growl', 'coverage'
+		reporters: ['dots'],
 
-// enable / disable colors in the output (reporters and logs)
-colors = true;
+		// web server port
+		port: 9876,
 
-// level of logging
-// possible values: LOG_DISABLE || LOG_ERROR || LOG_WARN || LOG_INFO || LOG_DEBUG
-logLevel = LOG_WARN;
+		// level of logging
+		// possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+		logLevel: config.LOG_WARN,
 
-// enable / disable watching file and executing tests whenever any file changes
-autoWatch = false;
+		// enable / disable colors in the output (reporters and logs)
+		colors: true,
 
-// Start these browsers, currently available:
-// - Chrome
-// - ChromeCanary
-// - Firefox
-// - Opera
-// - Safari (only Mac)
-// - PhantomJS
-// - IE (only Windows)
-browsers = ['PhantomJS'];
+		// enable / disable watching file and executing tests whenever any file changes
+		autoWatch: false,
 
-// If browser does not capture in given timeout [ms], kill it
-captureTimeout = 5000;
+		// Start these browsers, currently available:
+		// - Chrome
+		// - ChromeCanary
+		// - Firefox
+		// - Opera
+		// - Safari (only Mac)
+		// - PhantomJS
+		// - IE (only Windows)
+		browsers: ['PhantomJS'],
 
-// Continuous Integration mode
-// if true, it capture browsers, run tests and exit
-singleRun = true;
+		// If browser does not capture in given timeout [ms], kill it
+		captureTimeout: 5000,
+
+		// Continuous Integration mode
+		// if true, it capture browsers, run tests and exit
+		singleRun: true
+	});
+};

data/lib/leaflet/spec/spec.hintrc.js

@@ -0,0 +1,25 @@
+{
+	"browser": true,
+	"node": true,
+	"predef": ["define", "L", "expect", "describe", "it", "sinon", "happen", "beforeEach", "afterEach"],
+	"strict": false,
+	"bitwise": true,
+	"camelcase": true,
+	"curly": true,
+	"eqeqeq": true,
+	"forin": false,
+	"immed": true,
+	"latedef": true,
+	"newcap": true,
+	"noarg": true,
+	"noempty": true,
+	"nonew": true,
+	"undef": true,
+	// "unused": true,
+	// "quotmark": "single",
+	"indent": 4,
+	"trailing": true,
+	"white": true,
+	"smarttabs": true
+	// "maxlen": 120
+}

data/lib/leaflet/spec/suites/LeafletSpec.js

@@ -1,5 +1,5 @@
-describe('L#noConflict', function() {
-	it('restores the previous L value and returns Leaflet namespace', function(){
+describe('L#noConflict', function () {
+	it('restores the previous L value and returns Leaflet namespace', function () {
 
 		expect(L.version).to.be.ok();
 

data/lib/leaflet/spec/suites/SpecHelper.js

@@ -1,26 +1,42 @@
-function noSpecs() {
-	xit('has no specs');
-}
-
 if (!Array.prototype.map) {
-  Array.prototype.map = function(fun /*, thisp */) {
-    "use strict";
+	Array.prototype.map = function (fun /*, thisp */) {
+		"use strict";
+
+		if (this === void 0 || this === null) {
+			throw new TypeError();
+		}
 
-    if (this === void 0 || this === null)
-      throw new TypeError();
+		var t = Object(this);
+		// jshint bitwise: false
+		var len = t.length >>> 0;
+		if (typeof fun !== "function") {
+			throw new TypeError();
+		}
 
-    var t = Object(this);
-    var len = t.length >>> 0;
-    if (typeof fun !== "function")
-      throw new TypeError();
+		var res = new Array(len);
+		var thisp = arguments[1];
+		for (var i = 0; i < len; i++) {
+			if (i in t) {
+				res[i] = fun.call(thisp, t[i], i, t);
+			}
+		}
+
+		return res;
+	};
+}
 
-    var res = new Array(len);
-    var thisp = arguments[1];
-    for (var i = 0; i < len; i++) {
-      if (i in t)
-        res[i] = fun.call(thisp, t[i], i, t);
-    }
+expect.Assertion.prototype.near = function (expected, delta) {
+	delta = delta || 1;
+	expect(this.obj.x).to
+		.be.within(expected.x - delta, expected.x + delta);
+	expect(this.obj.y).to
+		.be.within(expected.y - delta, expected.y + delta);
+};
 
-    return res;
-  };
-}
+expect.Assertion.prototype.nearLatLng = function (expected, delta) {
+	delta = delta || 1e-4;
+	expect(this.obj.lat).to
+		.be.within(expected.lat - delta, expected.lat + delta);
+	expect(this.obj.lng).to
+		.be.within(expected.lng - delta, expected.lng + delta);
+};

data/lib/leaflet/spec/suites/control/Control.LayersSpec.js

@@ -12,7 +12,7 @@ describe("Control.Layers", function () {
 				spy = sinon.spy();
 
 			map.on('baselayerchange', spy)
-				.whenReady(function() {
+				.whenReady(function () {
 					happen.click(layers._baseLayersList.getElementsByTagName("input")[0]);
 
 					expect(spy.called).to.be.ok();

data/lib/leaflet/spec/suites/core/ClassSpec.js

@@ -1,11 +1,11 @@
-describe("Class", function() {
+describe("Class", function () {
 
-	describe("#extend", function() {
+	describe("#extend", function () {
 		var Klass,
 			constructor,
 			method;
 
-		beforeEach(function() {
+		beforeEach(function () {
 			constructor = sinon.spy();
 			method = sinon.spy();
 
@@ -19,7 +19,7 @@ describe("Class", function() {
 			});
 		});
 
-		it("creates a class with the given constructor & properties", function() {
+		it("creates a class with the given constructor & properties", function () {
 			var a = new Klass();
 
 			expect(constructor.called).to.be.ok();
@@ -30,7 +30,7 @@ describe("Class", function() {
 			expect(method.called).to.be.ok();
 		});
 
-		it("inherits parent classes' constructor & properties", function() {
+		it("inherits parent classes' constructor & properties", function () {
 			var Klass2 = Klass.extend({baz: 2});
 
 			var b = new Klass2();
@@ -46,28 +46,28 @@ describe("Class", function() {
 			expect(method.called).to.be.ok();
 		});
 
-		it("supports static properties", function() {
+		it("supports static properties", function () {
 			expect(Klass.bla).to.eql(1);
 		});
 
-		it("inherits parent static properties", function() {
+		it("inherits parent static properties", function () {
 			var Klass2 = Klass.extend({});
 
 			expect(Klass2.bla).to.eql(1);
 		});
 
-		it("overrides parent static properties", function() {
+		it("overrides parent static properties", function () {
 			var Klass2 = Klass.extend({statics: {bla: 2}});
 
 			expect(Klass2.bla).to.eql(2);
 		});
 
-		it("includes the given mixin", function() {
+		it("includes the given mixin", function () {
 			var a = new Klass();
 			expect(a.mixin).to.be.ok();
 		});
 
-		it("includes multiple mixins", function() {
+		it("includes multiple mixins", function () {
 			var Klass2 = L.Class.extend({
 				includes: [{mixin: true}, {mixin2: true}]
 			});
@@ -77,14 +77,14 @@ describe("Class", function() {
 			expect(a.mixin2).to.be.ok();
 		});
 
-		it("grants the ability to include the given mixin", function() {
+		it("grants the ability to include the given mixin", function () {
 			Klass.include({mixin2: true});
 
 			var a = new Klass();
 			expect(a.mixin2).to.be.ok();
 		});
 
-		it("merges options instead of replacing them", function() {
+		it("merges options instead of replacing them", function () {
 			var KlassWithOptions1 = L.Class.extend({
 				options: {
 					foo1: 1,

data/lib/leaflet/spec/suites/core/EventsSpec.js

@@ -1,21 +1,21 @@
-describe('Events', function() {
+describe('Events', function () {
 	var Klass;
 
-	beforeEach(function() {
+	beforeEach(function () {
 		Klass = L.Class.extend({
 			includes: L.Mixin.Events
 		});
 	});
 
-	describe('#fireEvent', function() {
+	describe('#fireEvent', function () {
 
-		it('fires all listeners added through #addEventListener', function() {
+		it('fires all listeners added through #addEventListener', function () {
 			var obj = new Klass(),
 				spy1 = sinon.spy(),
 				spy2 = sinon.spy(),
 				spy3 = sinon.spy(),
 				spy4 = sinon.spy(),
-				spy5 = sinon.spy();
+				spy5 = sinon.spy(),
 				spy6 = sinon.spy();
 
 			obj.addEventListener('test', spy1);
@@ -42,7 +42,7 @@ describe('Events', function() {
 			expect(spy6.callCount).to.be(1);
 		});
 
-		it('provides event object to listeners and executes them in the right context', function() {
+		it('provides event object to listeners and executes them in the right context', function () {
 			var obj = new Klass(),
 				obj2 = new Klass(),
 				obj3 = new Klass(),
@@ -88,7 +88,7 @@ describe('Events', function() {
 			obj4.fireEvent('test', {baz: 4});
 		});
 
-		it('calls no listeners removed through #removeEventListener', function() {
+		it('calls no listeners removed through #removeEventListener', function () {
 			var obj = new Klass(),
 				spy = sinon.spy(),
 				spy2 = sinon.spy(),
@@ -171,7 +171,7 @@ describe('Events', function() {
 			expect(spy2.called).to.be(true);
 		});
 
-		it('removes listeners with a stamp originally added without one', function() {
+		it('removes listeners with a stamp originally added without one', function () {
 			var obj = new Klass(),
 				spy1 = sinon.spy(),
 				spy2 = sinon.spy(),
@@ -189,6 +189,30 @@ describe('Events', function() {
 			expect(spy1.called).to.be(false);
 			expect(spy2.called).to.be(false);
 		});
+
+		it('removes listeners with context == this and a stamp originally added without one', function () {
+			var obj = new Klass(),
+				obj2 = new Klass(),
+				spy1 = sinon.spy(),
+				spy2 = sinon.spy(),
+				spy3 = sinon.spy();
+
+			obj.addEventListener('test', spy1, obj);
+			L.Util.stamp(obj);
+			obj.addEventListener('test', spy2, obj);
+			obj.addEventListener('test', spy3, obj2); // So that there is a contextId based listener, otherwise removeEventListener will do correct behaviour anyway
+
+			obj.removeEventListener('test', spy1, obj);
+			obj.removeEventListener('test', spy2, obj);
+			obj.removeEventListener('test', spy3, obj2);
+
+			obj.fireEvent('test');
+
+			expect(spy1.called).to.be(false);
+			expect(spy2.called).to.be(false);
+			expect(spy3.called).to.be(false);
+		});
+
 		it('doesnt lose track of listeners when removing non existent ones', function () {
 			var obj = new Klass(),
 			    spy = sinon.spy(),
@@ -210,11 +234,43 @@ describe('Events', function() {
 
 			expect(spy.called).to.be(false);
 		});
+
+		it('correctly removes all listeners if given no fn', function () {
+			var obj = new Klass(),
+			    spy = sinon.spy(),
+			    foo = {},
+			    foo2 = {},
+			    foo3 = {};
+
+			obj.addEventListener('test', spy, foo2);
+			obj.addEventListener('test', spy, foo3);
+
+			obj.removeEventListener('test'); // Removes both of the above listeners
+
+			expect(obj.hasEventListeners('test')).to.be(false);
+
+			//Add and remove a listener
+			obj.addEventListener('test', spy, foo2);
+			obj.removeEventListener('test', spy, foo2);
+
+			expect(obj.hasEventListeners('test')).to.be(false);
+		});
+
+		it('makes sure an event is not triggered if a listener is removed during dispatch', function () {
+			var obj = new Klass(),
+			    spy = sinon.spy();
+
+			obj.addEventListener('test', function () { obj.removeEventListener('test', spy); });
+			obj.addEventListener('test', spy);
+			obj.fireEvent('test');
+
+			expect(spy.called).to.be(false);
+		});
 	});
 
-	describe('#on, #off & #fire', function() {
+	describe('#on, #off & #fire', function () {
 
-		it('works like #addEventListener && #removeEventListener', function() {
+		it('works like #addEventListener && #removeEventListener', function () {
 			var obj = new Klass(),
 				spy = sinon.spy();
 
@@ -229,7 +285,7 @@ describe('Events', function() {
 			expect(spy.callCount).to.be.lessThan(2);
 		});
 
-		it('does not override existing methods with the same name', function() {
+		it('does not override existing methods with the same name', function () {
 			var spy1 = sinon.spy(),
 				spy2 = sinon.spy(),
 				spy3 = sinon.spy();
@@ -254,10 +310,10 @@ describe('Events', function() {
 		});
 	});
 
-	describe("#clearEventListeners", function() {
-		it("clears all registered listeners on an object", function() {
+	describe("#clearEventListeners", function () {
+		it("clears all registered listeners on an object", function () {
 			var spy = sinon.spy(),
-				obj = new Klass()
+				obj = new Klass(),
 				otherObj = new Klass();
 
 			obj.on('test', spy, obj);
@@ -271,8 +327,8 @@ describe('Events', function() {
 		});
 	});
 
-	describe('#once', function() {
-		it('removes event listeners after first trigger', function() {
+	describe('#once', function () {
+		it('removes event listeners after first trigger', function () {
 			var obj = new Klass(),
 				spy = sinon.spy();
 
@@ -286,7 +342,7 @@ describe('Events', function() {
 			expect(spy.callCount).to.be.lessThan(2);
 		});
 
-		it('works with an object hash', function() {
+		it('works with an object hash', function () {
 			var obj = new Klass(),
 				spy = sinon.spy(),
 				otherSpy = sinon.spy();
@@ -321,7 +377,7 @@ describe('Events', function() {
 		    expect(spy.called).to.be(false);
 		});
 
-		it('works if called from a context that doesnt implement #Events', function() {
+		it('works if called from a context that doesnt implement #Events', function () {
 			var obj = new Klass(),
 				spy = sinon.spy(),
 				foo = {};