From 90b1395df4e0ce93333ef5edd70f1286450922d1 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 1 Apr 2020 13:27:30 -0700 Subject: [PATCH] Fix code tests --- modules/presets/index.js | 2 +- test/spec/presets/index.js | 21 ++++++++++++++------- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/modules/presets/index.js b/modules/presets/index.js index ad4da51ce..9860918fc 100644 --- a/modules/presets/index.js +++ b/modules/presets/index.js @@ -325,7 +325,7 @@ export function presetIndex() { }; // pass a Set of addable preset ids - _this.addablePresetIDs = (val) => { + _this.addablePresetIDs = function(val) { if (!arguments.length) return _addablePresetIDs; _addablePresetIDs = val; diff --git a/test/spec/presets/index.js b/test/spec/presets/index.js index 9424bfa90..e832ff2e7 100644 --- a/test/spec/presets/index.js +++ b/test/spec/presets/index.js @@ -179,7 +179,13 @@ describe('iD.presetIndex', function () { describe('#addablePresetIDs', function () { - it('addablePresetIDs is initially null', function () { + var testPresets = { + residential: { tags: { highway: 'residential' }, geometry: ['line'] }, + park: { tags: { leisure: 'park' }, geometry: ['point', 'area'] } + }; + + it('addablePresetIDs is initially null', function (done) { + iD.fileFetcher.cache().preset_presets = testPresets; var presets = iD.presetIndex(); presets.ensureLoaded().then(function() { expect(presets.addablePresetIDs()).to.be.null; @@ -187,19 +193,20 @@ describe('iD.presetIndex', function () { }); }); - it('can set and get addablePresetIDs', function () { + it('can set and get addablePresetIDs', function (done) { + iD.fileFetcher.cache().preset_presets = testPresets; var presets = iD.presetIndex(); presets.ensureLoaded().then(function() { - var ids = new Set(['point']); // can only add points + var ids = new Set(['residential']); // can only add preset with this ID presets.addablePresetIDs(ids); - expect(presets.item('point').addable()).to.be.true; - expect(presets.item('line').addable()).to.be.false; + expect(presets.item('residential').addable()).to.be.true; + expect(presets.item('park').addable()).to.be.false; expect(presets.addablePresetIDs()).to.eql(ids); presets.addablePresetIDs(null); - expect(presets.item('point').addable()).to.be.true; - expect(presets.item('line').addable()).to.be.true; + expect(presets.item('residential').addable()).to.be.true; + expect(presets.item('park').addable()).to.be.true; done(); }); });