From 1bed567f928642cc6867bc5978c719ac38dbdca1 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Sat, 30 May 2015 10:08:02 -0700 Subject: [PATCH 1/4] [testing] update mocha --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 8e73b65571da..c58bba6fea6c 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "marked": "^0.3.2", "marked-text-renderer": "^0.1.0", "mkdirp": "^0.5.0", - "mocha": "~1.20.1", + "mocha": "^2.2.5", "mocha-screencast-reporter": "~0.1.4", "opn": "~1.0.0", "path-browserify": "0.0.0", From 446ee5b41083233c70b41ba1e799da37565623a6 Mon Sep 17 00:00:00 2001 From: Spencer Alger Date: Sat, 30 May 2015 11:06:31 -0700 Subject: [PATCH 2/4] [testing] prevent sync method from timing out. --- test/unit/specs/components/agg_response/geo_json/geo_json.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/unit/specs/components/agg_response/geo_json/geo_json.js b/test/unit/specs/components/agg_response/geo_json/geo_json.js index faced1b13ec0..ae5ec53fdb50 100644 --- a/test/unit/specs/components/agg_response/geo_json/geo_json.js +++ b/test/unit/specs/components/agg_response/geo_json/geo_json.js @@ -52,7 +52,6 @@ define(function (require) { } describe('with table ' + JSON.stringify(tableOpts), function () { - it('outputs a chart', function () { var table = makeTable(); var chart = makeSingleChart(table); @@ -100,6 +99,8 @@ define(function (require) { describe('properties', function () { it('includes one feature per row in the table', function () { + this.timeout(0); + var table = makeTable(); var chart = makeSingleChart(table); var geoColI = _.findIndex(table.columns, { aggConfig: aggs.geo }); From 92147fe2693349abbc4e2b0821c7928309c51c60 Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Tue, 2 Jun 2015 13:57:13 -0700 Subject: [PATCH 3/4] Fixed a test that was actually invalid. --- src/kibana/components/filter_bar/lib/generateMappingChain.js | 2 +- .../unit/specs/components/filter_bar/generateMappingChain.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kibana/components/filter_bar/lib/generateMappingChain.js b/src/kibana/components/filter_bar/lib/generateMappingChain.js index b908ea343635..092a14e21f4f 100644 --- a/src/kibana/components/filter_bar/lib/generateMappingChain.js +++ b/src/kibana/components/filter_bar/lib/generateMappingChain.js @@ -14,7 +14,7 @@ define(function (require) { if (result === filter) { return next(filter); } - throw result; + return Promise.reject(result); }); }; }; diff --git a/test/unit/specs/components/filter_bar/generateMappingChain.js b/test/unit/specs/components/filter_bar/generateMappingChain.js index 283133791389..38277aa82596 100644 --- a/test/unit/specs/components/filter_bar/generateMappingChain.js +++ b/test/unit/specs/components/filter_bar/generateMappingChain.js @@ -15,13 +15,14 @@ define(function (require) { it('should create a chaning function which calls the next function if the promise is rejected', function (done) { + var filter = {}; var mapping = sinon.stub(); - mapping.returns(Promise.reject()); + mapping.returns(Promise.reject(filter)); var mappingChainFn = generateMappingChain(mapping); var next = sinon.stub(); next.returns(Promise.resolve('good')); var chain = mappingChainFn(next); - chain({}).then(function (result) { + chain(filter).then(function (result) { expect(result).to.be('good'); sinon.assert.calledOnce(next); done(); From 233d45b6d1b2c528f4347f5dd604f504da31039a Mon Sep 17 00:00:00 2001 From: Chris Cowan Date: Tue, 2 Jun 2015 15:52:34 -0700 Subject: [PATCH 4/4] Fixing tests --- .../components/filter_bar/generateMappingChain.js | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/unit/specs/components/filter_bar/generateMappingChain.js b/test/unit/specs/components/filter_bar/generateMappingChain.js index 38277aa82596..1d2e4d12f39d 100644 --- a/test/unit/specs/components/filter_bar/generateMappingChain.js +++ b/test/unit/specs/components/filter_bar/generateMappingChain.js @@ -76,13 +76,14 @@ define(function (require) { }); it('should resolve result for the next function', function (done) { + var filter = {}; var mapping = sinon.stub(); - mapping.returns(Promise.reject()); + mapping.returns(Promise.reject(filter)); var mappingChainFn = generateMappingChain(mapping); var next = sinon.stub(); next.returns(Promise.resolve({ key: 'test', value: 'example' })); var chain = mappingChainFn(next); - chain({}).then(function (result) { + chain(filter).then(function (result) { sinon.assert.calledOnce(mapping); sinon.assert.calledOnce(next); expect(result).to.eql({ key: 'test', value: 'example' }); @@ -92,13 +93,14 @@ define(function (require) { }); it('should reject with an error if no functions match', function (done) { + var filter = {}; var mapping = sinon.stub(); - mapping.returns(Promise.reject()); + mapping.returns(Promise.reject(filter)); var mappingChainFn = generateMappingChain(mapping); var chain = mappingChainFn(); - chain({}).catch(function (err) { + chain(filter).catch(function (err) { expect(err).to.be.an(Error); - expect(err.message).to.be('No mapping have been found for filter.'); + expect(err.message).to.be('No mappings have been found for filter.'); done(); }); $rootScope.$apply();