create mock courier, update tests to use it

This commit is contained in:
Joe Fleming 2015-05-18 14:18:27 -07:00
parent b387b7b658
commit 5e8b33a9a4
16 changed files with 68 additions and 143 deletions

View file

@ -0,0 +1,17 @@
define(function (require) {
var _ = require('lodash');
var sinon = require('test_utils/auto_release_sinon');
return function (Private, Promise) {
var indexPatterns = Private(require('fixtures/stubbed_logstash_index_pattern'));
var getIndexPatternStub = sinon.stub();
getIndexPatternStub.returns(Promise.resolve(indexPatterns));
var courier = {
indexPatterns: { get: getIndexPatternStub },
getStub: getIndexPatternStub
};
return courier;
};
});

View file

@ -9,7 +9,7 @@ define(function (require) {
};
var filters;
var queryFilter;
var $rootScope, getIndexPatternStub, appState, globalState;
var $rootScope, appState, globalState;
beforeEach(module('kibana'));
@ -34,12 +34,11 @@ define(function (require) {
});
beforeEach(function () {
module('kibana/global_state', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
module('kibana/courier', function ($provide) {
$provide.service('courier', require('fixtures/mock_courier'));
});
module('kibana/global_state', function ($provide) {
$provide.service('getAppState', function () {
return function () {
return appState;
@ -53,11 +52,7 @@ define(function (require) {
});
beforeEach(function () {
getIndexPatternStub = sinon.stub();
inject(function (_$rootScope_, Private, Promise) {
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
$rootScope = _$rootScope_;
queryFilter = Private(require('components/filter_bar/query_filter'));
});

View file

@ -9,7 +9,7 @@ define(function (require) {
};
var filters;
var queryFilter;
var $rootScope, getIndexPatternStub, appState, globalState;
var $rootScope, appState, globalState;
beforeEach(module('kibana'));
@ -34,12 +34,11 @@ define(function (require) {
});
beforeEach(function () {
module('kibana/global_state', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
module('kibana/courier', function ($provide) {
$provide.service('courier', require('fixtures/mock_courier'));
});
module('kibana/global_state', function ($provide) {
$provide.service('getAppState', function () {
return function () {
return appState;
@ -53,11 +52,7 @@ define(function (require) {
});
beforeEach(function () {
getIndexPatternStub = sinon.stub();
inject(function (_$rootScope_, Private, Promise) {
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
$rootScope = _$rootScope_;
queryFilter = Private(require('components/filter_bar/query_filter'));
});

View file

@ -9,7 +9,7 @@ define(function (require) {
};
var filters;
var queryFilter;
var $rootScope, getIndexPatternStub, appState, globalState;
var $rootScope, appState, globalState;
beforeEach(module('kibana'));
@ -54,12 +54,11 @@ define(function (require) {
});
beforeEach(function () {
module('kibana/global_state', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
module('kibana/courier', function ($provide) {
$provide.service('courier', require('fixtures/mock_courier'));
});
module('kibana/global_state', function ($provide) {
$provide.service('getAppState', function () {
return function () {
return appState;
@ -73,11 +72,7 @@ define(function (require) {
});
beforeEach(function () {
getIndexPatternStub = sinon.stub();
inject(function (_$rootScope_, Private, Promise) {
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
$rootScope = _$rootScope_;
queryFilter = Private(require('components/filter_bar/query_filter'));
});

View file

@ -9,7 +9,7 @@ define(function (require) {
};
var filters;
var queryFilter;
var $rootScope, getIndexPatternStub, appState, globalState;
var $rootScope, appState, globalState;
beforeEach(module('kibana'));
@ -34,13 +34,11 @@ define(function (require) {
});
beforeEach(function () {
module('kibana/courier', function ($provide) {
$provide.service('courier', require('fixtures/mock_courier'));
});
module('kibana/global_state', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('getAppState', function () {
return function () {
return appState;
@ -54,11 +52,7 @@ define(function (require) {
});
beforeEach(function () {
getIndexPatternStub = sinon.stub();
inject(function (_$rootScope_, Private, Promise) {
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
$rootScope = _$rootScope_;
queryFilter = Private(require('components/filter_bar/query_filter'));
});

View file

@ -9,7 +9,7 @@ define(function (require) {
};
var filters;
var queryFilter;
var $rootScope, getIndexPatternStub, appState, globalState;
var $rootScope, appState, globalState;
beforeEach(module('kibana'));
@ -34,12 +34,11 @@ define(function (require) {
});
beforeEach(function () {
module('kibana/global_state', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
module('kibana/courier', function ($provide) {
$provide.service('courier', require('fixtures/mock_courier'));
});
module('kibana/global_state', function ($provide) {
$provide.service('getAppState', function () {
return function () {
return appState;
@ -53,11 +52,7 @@ define(function (require) {
});
beforeEach(function () {
getIndexPatternStub = sinon.stub();
inject(function (_$rootScope_, Private, Promise) {
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
$rootScope = _$rootScope_;
queryFilter = Private(require('components/filter_bar/query_filter'));
});

View file

@ -3,27 +3,19 @@ define(function (require) {
describe('extractTimeFilter()', function () {
var sinon = require('test_utils/auto_release_sinon');
var extractTimeFilter,
$rootScope,
indexPattern,
getIndexPatternStub;
$rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
extractTimeFilter = Private(require('components/filter_bar/lib/extractTimeFilter'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
it('should return the matching filter for the defualt time field', function (done) {

View file

@ -4,27 +4,19 @@ define(function (require) {
var sinon = require('test_utils/auto_release_sinon');
var filterOutTimeBasedFilter,
$rootScope,
indexPattern,
getIndexPatternStub;
$rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
filterOutTimeBasedFilter = Private(require('components/filter_bar/lib/filterOutTimeBasedFilter'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
it('should return the matching filter for the defualt time field', function (done) {

View file

@ -9,7 +9,7 @@ define(function (require) {
describe('Filter Bar Directive', function () {
var $rootScope, $compile, $timeout, Promise;
var appState, queryFilter, mapFilter, getIndexPatternStub, indexPattern, $el;
var appState, queryFilter, mapFilter, $el;
// require('test_utils/no_digest_promises').activateForSuite();
beforeEach(function () {
@ -28,13 +28,8 @@ define(function (require) {
// load the application
module('kibana');
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
inject(function (Private, $injector, _$rootScope_, _$compile_, _$timeout_) {
@ -44,9 +39,6 @@ define(function (require) {
Promise = $injector.get('Promise');
mapFilter = Private(require('components/filter_bar/lib/mapFilter'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
var queryFilter = Private(require('components/filter_bar/query_filter'));
queryFilter.getFilters = function () {
return appState.filters;

View file

@ -2,25 +2,19 @@ define(function (require) {
describe('Filter Bar Directive', function () {
describe('mapAndFlattenFilters()', function () {
var sinon = require('test_utils/auto_release_sinon');
var mapAndFlattenFilters, $rootScope, indexPattern, getIndexPatternStub;
var mapAndFlattenFilters, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(inject(function (Private, _$rootScope_) {
mapAndFlattenFilters = Private(require('components/filter_bar/lib/mapAndFlattenFilters'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
var filters = [

View file

@ -1,25 +1,19 @@
define(function (require) {
describe('Filter Bar Directive', function () {
var sinon = require('test_utils/auto_release_sinon');
var mapFilter, $rootScope, indexPattern, getIndexPatternStub;
var mapFilter, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Promise, _$rootScope_, Private) {
beforeEach(inject(function (_$rootScope_, Private) {
mapFilter = Private(require('components/filter_bar/lib/mapFilter'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
describe('mapFilter()', function () {

View file

@ -3,24 +3,18 @@ define(function (require) {
describe('Filter Bar Directive', function () {
describe('mapFlattenAndWrapFilters()', function () {
var sinon = require('test_utils/auto_release_sinon');
var mapFlattenAndWrapFilters, $rootScope, indexPattern, getIndexPatternStub;
var mapFlattenAndWrapFilters, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(inject(function (Private, _$rootScope_) {
mapFlattenAndWrapFilters = Private(require('components/filter_bar/lib/mapFlattenAndWrapFilters'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
var filters = [

View file

@ -2,24 +2,18 @@ define(function (require) {
describe('Filter Bar Directive', function () {
describe('mapGeoBoundingBox()', function () {
var sinon = require('test_utils/auto_release_sinon');
var mapGeoBoundingBox, $rootScope, indexPattern, getIndexPatternStub;
var mapGeoBoundingBox, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(inject(function (Private, _$rootScope_) {
mapGeoBoundingBox = Private(require('components/filter_bar/lib/mapGeoBoundingBox'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
it('should return the key and value for matching filters with bounds', function (done) {

View file

@ -2,24 +2,18 @@ define(function (require) {
describe('Filter Bar Directive', function () {
describe('mapRange()', function () {
var sinon = require('test_utils/auto_release_sinon');
var mapRange, $rootScope, indexPattern, getIndexPatternStub;
var mapRange, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(inject(function (Private, _$rootScope_) {
mapRange = Private(require('components/filter_bar/lib/mapRange'));
$rootScope = _$rootScope_;
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
it('should return the key and value for matching filters with gt/lt', function (done) {

View file

@ -2,24 +2,18 @@ define(function (require) {
describe('Filter Bar Directive', function () {
describe('mapScript()', function () {
var sinon = require('test_utils/auto_release_sinon');
var indexPattern, mapScript, $rootScope, getIndexPatternStub;
var mapScript, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(inject(function (Private, _$rootScope_) {
$rootScope = _$rootScope_;
mapScript = Private(require('components/filter_bar/lib/mapScript'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
it('should return the key and value for matching filters', function (done) {

View file

@ -2,24 +2,18 @@ define(function (require) {
describe('Filter Bar Directive', function () {
describe('mapTerms()', function () {
var sinon = require('test_utils/auto_release_sinon');
var indexPattern, mapTerms, $rootScope, getIndexPatternStub;
var mapTerms, $rootScope;
beforeEach(module('kibana'));
beforeEach(function () {
getIndexPatternStub = sinon.stub();
module('kibana/courier', function ($provide) {
$provide.service('courier', function () {
var courier = { indexPatterns: { get: getIndexPatternStub } };
return courier;
});
$provide.service('courier', require('fixtures/mock_courier'));
});
});
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(inject(function (Private, _$rootScope_) {
$rootScope = _$rootScope_;
mapTerms = Private(require('components/filter_bar/lib/mapTerms'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
getIndexPatternStub.returns(Promise.resolve(indexPattern));
}));
it('should return the key and value for matching filters', function (done) {