From c7363623ad9578a77450e98ad18b631f8a916181 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Thu, 22 Aug 2013 14:15:33 -0700 Subject: [PATCH] Fix tests --- test/spec/renderer/background_source.js | 12 ++++++------ test/spec/renderer/tile_layer.js | 1 - 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/test/spec/renderer/background_source.js b/test/spec/renderer/background_source.js index f091734fa..538df919f 100644 --- a/test/spec/renderer/background_source.js +++ b/test/spec/renderer/background_source.js @@ -1,27 +1,27 @@ describe('iD.BackgroundSource', function() { it('does not error with blank template', function() { var source = iD.BackgroundSource({ template: '' }); - expect(source([0,1,2])).to.equal(''); + expect(source.url([0,1,2])).to.equal(''); }); it('generates a tile-generating source', function() { var source = iD.BackgroundSource({ template: '{z}/{x}/{y}' }); - expect(source([0,1,2])).to.equal('2/0/1'); + expect(source.url([0,1,2])).to.equal('2/0/1'); }); it('supports subdomains', function() { var source = iD.BackgroundSource({ template: '{t}/{z}/{x}/{y}', subdomains: ['apples', 'oranges'] }); - expect(source([0,1,2])).to.equal('oranges/2/0/1'); + expect(source.url([0,1,2])).to.equal('oranges/2/0/1'); }); it('distributes requests between subdomains', function() { var source = iD.BackgroundSource({ template: '{t}/{z}/{x}/{y}', subdomains: ['apples', 'oranges'] }); - expect(source([0,1,1])).to.equal('oranges/1/0/1'); - expect(source([0,2,1])).to.equal('apples/1/0/2'); + expect(source.url([0,1,1])).to.equal('oranges/1/0/1'); + expect(source.url([0,2,1])).to.equal('apples/1/0/2'); }); it('supports josm style templates', function() { var source = iD.BackgroundSource({ template: '{switch:foo,bar}/{zoom}/{x}/{y}' }); - expect(source([0,1,1])).to.equal('bar/1/0/1'); + expect(source.url([0,1,1])).to.equal('bar/1/0/1'); }); }); diff --git a/test/spec/renderer/tile_layer.js b/test/spec/renderer/tile_layer.js index 9541d468a..69b514f16 100644 --- a/test/spec/renderer/tile_layer.js +++ b/test/spec/renderer/tile_layer.js @@ -4,7 +4,6 @@ describe('iD.TileLayer', function() { beforeEach(function() { d = d3.select(document.createElement('div')); c = iD.TileLayer().projection(d3.geo.mercator()); - d.call(c); }); afterEach(function() {