From a2b62b3bd21287697b19fa2bcd1acd0b10260bf2 Mon Sep 17 00:00:00 2001 From: Jan Pieter Waagmeester Date: Tue, 29 Oct 2013 11:36:42 +0100 Subject: [PATCH 1/2] Make Mocha ingore leaks, spaces -> tabs --- spec/index.html | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/spec/index.html b/spec/index.html index 6a377934..80f3143d 100644 --- a/spec/index.html +++ b/spec/index.html @@ -1,14 +1,14 @@ - - Spec Runner + + Leaflet Spec Runner -
- - +
+ + @@ -18,10 +18,10 @@ - + @@ -77,8 +77,8 @@ - + From 99bd248566629a4659fc79395897efd28e4de315 Mon Sep 17 00:00:00 2001 From: Jan Pieter Waagmeester Date: Tue, 29 Oct 2013 11:38:21 +0100 Subject: [PATCH 2/2] Whitespace OCD --- spec/suites/core/UtilSpec.js | 52 +++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/spec/suites/core/UtilSpec.js b/spec/suites/core/UtilSpec.js index f26befe6..37bc6e1a 100644 --- a/spec/suites/core/UtilSpec.js +++ b/spec/suites/core/UtilSpec.js @@ -1,16 +1,16 @@ -describe('Util', function() { +describe('Util', function () { - describe('#extend', function() { + describe('#extend', function () { var a; - beforeEach(function() { + beforeEach(function () { a = { foo: 5, bar: 'asd' }; }); - it('extends the first argument with the properties of the second', function() { + it('extends the first argument with the properties of the second', function () { L.Util.extend(a, { bar: 7, baz: 3 @@ -23,7 +23,7 @@ describe('Util', function() { }); }); - it('accepts more than 2 arguments', function() { + it('accepts more than 2 arguments', function () { L.Util.extend(a, {bar: 7}, {baz: 3}); expect(a).to.eql({ @@ -34,9 +34,9 @@ describe('Util', function() { }); }); - describe('#bind', function() { - it('returns the given function with the given context', function() { - var fn = function() { + describe('#bind', function () { + it('returns the given function with the given context', function () { + var fn = function () { return this; }; @@ -59,8 +59,8 @@ describe('Util', function() { }); }); - describe('#stamp', function() { - it('sets a unique id on the given object and returns it', function() { + describe('#stamp', function () { + it('sets a unique id on the given object and returns it', function () { var a = {}, id = L.Util.stamp(a); @@ -115,38 +115,37 @@ describe('Util', function() { }); - describe('#getParamString', function() { - it('creates a valid query string for appending depending on url input', function() { + describe('#getParamString', function () { + it('creates a valid query string for appending depending on url input', function () { var a = { - url: "http://example.com/get", + url: 'http://example.com/get', obj: {bar: 7, baz: 3}, - result: "?bar=7&baz=3" + result: '?bar=7&baz=3' }; - expect(L.Util.getParamString(a.obj,a.url)).to.eql(a.result); + expect(L.Util.getParamString(a.obj, a.url)).to.eql(a.result); var b = { - url: "http://example.com/get?justone=qs", + url: 'http://example.com/get?justone=qs', obj: {bar: 7, baz: 3}, - result: "&bar=7&baz=3" + result: '&bar=7&baz=3' }; - expect(L.Util.getParamString(b.obj,b.url)).to.eql(b.result); + expect(L.Util.getParamString(b.obj, b.url)).to.eql(b.result); var c = { url: undefined, obj: {bar: 7, baz: 3}, - result: "?bar=7&baz=3" + result: '?bar=7&baz=3' }; - expect(L.Util.getParamString(c.obj,c.url)).to.eql(c.result); + expect(L.Util.getParamString(c.obj, c.url)).to.eql(c.result); }); }); describe('#requestAnimFrame', function () { it('calles a function on next frame, unless canceled', function (done) { var spy = sinon.spy(), - spy2 = sinon.spy(), foo = {}; L.Util.requestAnimFrame(spy); @@ -160,7 +159,7 @@ describe('Util', function() { }); }); - describe('#limitExecByInterval', function() { + describe('#limitExecByInterval', function () { it('limits execution to not more often than specified time interval', function (done) { var spy = sinon.spy(); @@ -194,27 +193,29 @@ describe('Util', function() { var str = L.Util.template(tpl, { foo: 'Vlad', bar: 'Dave', - baz:function(o){ + baz: function (o) { return o.bar; } }); expect(str).to.eql('Hello Vlad and Dave!'); }); + it('check the cache', function () { var tpl = 'Hello {foo} and {baz }!'; var str = L.Util._templateCache[tpl]({ foo: 'ladies', - baz: function() { + baz: function () { return 'gentlemen'; } }); expect(str).to.eql('Hello ladies and gentlemen!'); }); + it('evaluates templates with a function', function () { - var tpl = L.Util.compileTemplate('Hello { foo } and { bar}!',{}); + var tpl = L.Util.compileTemplate('Hello { foo } and { bar}!', {}); var str1 = tpl({ foo: 'Vlad', @@ -228,6 +229,7 @@ describe('Util', function() { expect(str1).to.eql('Hello Vlad and Dave!'); expect(str2).to.eql('Hello {Calvin} and {Simon}!'); }); + it('does not modify text without a token variable', function () { expect(L.Util.template('foo', {})).to.eql('foo'); });