maxmustermann/kibana
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

move to ngMock module

Browse source
This commit is contained in:
spalger 2015-07-20 19:18:08 -07:00
parent 15864363d5
commit 75d0b074cd
204 changed files with 872 additions and 651 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/plugins/devMode/TestHarnessBuilder.js
View file

@ -52,9 +52,7 @@ module.exports = function (kbnServer) {
let deps = [];
let modules = {
angular: [],
require: [
'angular-mocks'
]
require: []
};
if (testFiles) {

188
src/plugins/devMode/index.js
View file

@ -14,6 +14,7 @@ module.exports = function devModePlugin(kibana) {
let fromRoot = require('../../utils/fromRoot');
let pathContains = require('../../utils/pathContains');
let UiApp = require('../../server/ui/UiApp');
const SRC = fromRoot('src');
const UI = fromRoot('src/ui');
@ -22,94 +23,96 @@ module.exports = function devModePlugin(kibana) {
return new kibana.Plugin({
init: function (server, options) {
server.ext('onPreHandler', istanbul({ root: SRC, displayRoot: SRC, filter: kibanaSrcFilter }));
server.ext('onPreHandler', istanbul({ root: UI, displayRoot: SRC, filter: kibanaSrcFilter }));
server.setupViews(__dirname);
let TestHarnessBuilder; // initialized in mixin below
let currentBuilder = null;
function getBuilder(path) {
if (!currentBuilder || currentBuilder.path !== path) {
currentBuilder = new TestHarnessBuilder(path);
}
return currentBuilder;
}
server.decorate('reply', 'renderTestHarness', function (path) {
let reply = this;
getBuilder(path).render().then(function (output) {
if (!output || !output.bundle) {
return reply(Boom.create(500, 'failed to build test bundle'));
}
return reply(output.bundle).type('application/javascript');
});
});
server.decorate('reply', 'renderTestHarnessSourceMap', function (path) {
let reply = this;
getBuilder(path).render().then(function (output) {
if (!output) {
return reply(Boom.create(500, 'failed to build test bundle'));
}
if (!output.map) {
return reply(Boom.notFound());
}
reply(output.map);
});
});
server.redirectToSlash('/tests/plugins/{pluginId}');
server.route({
path: '/tests/plugins/{pluginId}/',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
return reply.view('testHarness.jade', {
bundlePath: `/testBundle/plugins/${req.params.pluginId}/`,
});
}
}
});
server.route({
path: '/testBundle/plugins/{pluginId}/',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
return reply.renderTestHarness(req.pre.kbnPluginById.publicDir);
}
}
});
server.route({
path: '/testBundle/plugins/{pluginId}/*.map',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
return reply.renderTestHarnessSourceMap(req.pre.kbnPluginById.publicDir);
}
}
});
return kibana.mixin(function (kbnServer) {
TestHarnessBuilder = require('./TestHarnessBuilder')(kbnServer);
let TestHarnessBuilder = require('./TestHarnessBuilder')(kbnServer);
server.ext('onPreHandler', istanbul({ root: SRC, displayRoot: SRC, filter: kibanaSrcFilter }));
server.ext('onPreHandler', istanbul({ root: UI, displayRoot: SRC, filter: kibanaSrcFilter }));
server.setupViews(resolve(__dirname, 'views'));
server.redirectToSlash('/testUtils/plugins/{pluginId}');
let currentBuilder = null;
server.decorate('reply', 'renderTestPart', function (basePath, part, mimeType) {
let reply = this;
if (!currentBuilder || currentBuilder.path !== basePath) {
currentBuilder = new TestHarnessBuilder(basePath);
}
currentBuilder.render().then(function (output) {
if (!output || !output.bundle) {
return reply(Boom.create(500, 'failed to build test bundle'));
}
return reply(output[part]).type(mimeType);
});
});
server.route({
path: '/tests/plugins/{pluginId}/',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
let pluginId = req.params.pluginId;
let app = new UiApp(kbnServer.uiExports, {
id: `tests/plugins/${pluginId}`,
main: `/testBundle/plugins/${pluginId}/`,
autoload: {
angular: [],
require: []
}
});
return reply.renderApp(app, 'testHarness');
}
}
});
server.route({
path: '/testBundle/plugins/{pluginId}/',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
return reply.renderTestPart(req.pre.kbnPluginById.publicDir, 'bundle', 'application/javascript');
}
}
});
server.route({
path: '/testBundle/plugins/{pluginId}/*.map',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
return reply.renderTestPart(req.pre.kbnPluginById.publicDir, 'sourceMap', 'text/plain');
}
}
});
server.route({
path: '/testBundle/plugins/{pluginId}/css',
method: 'GET',
config: {
pre: [
'kbnPluginById(params.pluginId)'
],
handler: function (req, reply) {
return reply.renderTestPart(req.pre.kbnPluginById.publicDir, 'style', 'text/css');
}
}
});
});
},
@ -119,6 +122,7 @@ module.exports = function devModePlugin(kibana) {
],
modules: {
ngMock$: 'plugins/devMode/ngMock',
sinon$: {
path: fromRoot('node_modules/sinon/pkg/sinon.js'),
parse: false
@ -127,13 +131,19 @@ module.exports = function devModePlugin(kibana) {
testUtils: fromRoot('src/testUtils'),
mocha$: {
path: fromRoot('node_modules/mocha/mocha.js'),
exports: 'window.mocha'
exports: 'window.mocha',
imports: 'mochaStyles'
},
mochaStyles$: fromRoot('node_modules/mocha/mocha.css'),
'angular-mocks': {
path: require.resolve('angular-mocks'),
imports: 'angular,mocha'
},
}
},
loaders: [
{ test: /\/__tests__\//, loader: 'imports?mocha' }
]
}
});
};

103
src/plugins/devMode/public/bootstrap.js vendored
View file

@ -25,66 +25,63 @@ function setupCoverage(done) {
mocha.reporter(require('testUtils/istanbul_reporter/reporter'));
}
exports.bootstrap = function (kibana, sinon) {
exports.bootstrap = function () {
var $ = require('jquery');
var _ = require('lodash');
var sinon = require('sinon');
$(function () {
var _desc = window.describe;
window.describe = _.wrap(_desc, unwindDescribeArrays);
window.describe.only = _.wrap(_desc.only, unwindDescribeArrays);
var _desc = window.describe;
window.describe = _.wrap(_desc, unwindDescribeArrays);
window.describe.only = _.wrap(_desc.only, unwindDescribeArrays);
if (COVERAGE) {
setupCoverage();
}
$('#mocha').html('');
kibana.load(startMocha);
if (COVERAGE) {
setupCoverage();
}
function startMocha() {
var xhr = sinon.useFakeXMLHttpRequest();
window.mochaRunner = mocha.run().on('end', function () {
window.mochaResults = this.stats;
window.mochaResults.details = getFailedTests(this);
xhr.restore();
});
require('ui/chrome').setupAngular();
mocha.run();
}
function getFailedTests(runner) {
var fails = [];
var suiteStack = [];
(function recurse(suite) {
suiteStack.push(suite);
(suite.tests || [])
.filter(function (test) {
return test.state && test.state !== 'passed' && test.state !== 'pending';
})
.forEach(function (test) {
fails.push({
title: suiteStack.concat(test).reduce(function (title, suite) {
if (suite.title) {
return (title ? title + ' ' : '') + suite.title;
} else {
return title;
}
}, ''),
err: test.err ? (test.err.stack || test.err.message) : 'unknown error'
});
});
(suite.suites || []).forEach(recurse);
suiteStack.pop();
}(runner.suite));
return fails;
}
function unwindDescribeArrays(fn, name, body) {
if (!body && name && name instanceof Array) {
body = name[1];
name = name[0];
}
return fn.call(this, name, body);
}
var xhr = sinon.useFakeXMLHttpRequest();
window.mochaRunner = mocha.run().on('end', function () {
window.mochaResults = this.stats;
window.mochaResults.details = getFailedTests(this);
xhr.restore();
});
function getFailedTests(runner) {
var fails = [];
var suiteStack = [];
(function recurse(suite) {
suiteStack.push(suite);
(suite.tests || [])
.filter(function (test) {
return test.state && test.state !== 'passed' && test.state !== 'pending';
})
.forEach(function (test) {
fails.push({
title: suiteStack.concat(test).reduce(function (title, suite) {
if (suite.title) {
return (title ? title + ' ' : '') + suite.title;
} else {
return title;
}
}, ''),
err: test.err ? (test.err.stack || test.err.message) : 'unknown error'
});
});
(suite.suites || []).forEach(recurse);
suiteStack.pop();
}(runner.suite));
return fails;
}
function unwindDescribeArrays(fn, name, body) {
if (!body && _.isArray(name)) {
body = name[1];
name = name[0];
}
return fn.call(this, name, body);
}
};

2
src/plugins/devMode/public/ngMock.js Normal file
View file

@ -0,0 +1,2 @@
require('angular-mocks');
module.exports = require('angular').mock;

7
src/plugins/devMode/testHarness.jade
View file

@ -1,7 +0,0 @@
doctype html
html
head
title Kibana4 Tests
script(async, src=bundlePath)
body
#mocha Loading tests, please wait.

8
src/plugins/devMode/views/testHarness.jade Normal file
View file

@ -0,0 +1,8 @@
extends ../../../server/ui/views/chrome.jade
block head
link(rel='stylesheet', href='#{app.main}css')
block content
#mocha
script(async src=app.main)

7
src/plugins/kibana/public/discover/__tests__/directives/discover_field.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var $ = require('jquery');
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var ngMock = require('ngMock');
var expect = require('expect.js');
// Load the kibana app dependencies.
@ -12,7 +13,7 @@ define(function (require) {
var $parentScope, $scope, indexPattern;
var init = function ($elem, props) {
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
$parentScope = $rootScope;
_.assign($parentScope, props);
$compile($elem)($parentScope);
@ -42,10 +43,10 @@ define(function (require) {
describe('discoverField', function () {
var $elem;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
$elem = angular.element('<discover-field></discover-field>');
inject(function (Private) {
ngMock.inject(function (Private) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
});
init($elem, {

5
src/plugins/kibana/public/discover/__tests__/directives/field_calculator.js
View file

@ -1,5 +1,6 @@
define(function (require) {
var _ = require('lodash');
var ngMock = require('ngMock');
var fieldCalculator = require('plugins/kibana/discover/components/field_chooser/lib/field_calculator');
var expect = require('expect.js');
@ -9,9 +10,9 @@ define(function (require) {
var indexPattern;
describe('fieldCalculator', function () {
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
inject(function (Private) {
ngMock.inject(function (Private) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
});
});

7
src/plugins/kibana/public/discover/__tests__/directives/field_chooser.js
View file

@ -1,5 +1,6 @@
define(function (require) {
var angular = require('angular');
var ngMock = require('ngMock');
var $ = require('jquery');
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
@ -18,7 +19,7 @@ define(function (require) {
// Sets up the directive, take an element, and a list of properties to attach to the parent scope.
var init = function ($elem, props) {
inject(function ($rootScope, $compile, $timeout, _config_) {
ngMock.inject(function ($rootScope, $compile, $timeout, _config_) {
config = _config_;
$parentScope = $rootScope;
_.assign($parentScope, props);
@ -52,9 +53,9 @@ define(function (require) {
'</disc-field-chooser>'
);
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
inject(function (Private) {
ngMock.inject(function (Private) {
hits = Private(require('fixtures/hits'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
indexPatternList = [ 'b', 'a', 'c' ];

5
src/plugins/kibana/public/discover/__tests__/hit_sort_fn.js
View file

@ -1,5 +1,6 @@
define(function (require) {
var _ = require('lodash');
var ngMock = require('ngMock');
var expect = require('expect.js');
require('angular').module('hitSortFunctionTests', ['kibana']);
@ -7,8 +8,8 @@ define(function (require) {
describe('hit sort function', function () {
var createHitSortFn;
beforeEach(module('hitSortFunctionTests'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('hitSortFunctionTests'));
beforeEach(ngMock.inject(function (Private) {
createHitSortFn = Private(require('plugins/kibana/discover/_hit_sort_fn'));
}));

7
src/plugins/kibana/public/doc/__tests__/doc.js
View file

@ -2,6 +2,7 @@ define(function (require) {
// Load the kibana app dependencies.
require('angular-route');
var ngMock = require('ngMock');
var expect = require('expect.js');
require('plugins/kibana/doc/index');
@ -9,10 +10,10 @@ define(function (require) {
var init = function (index, type, id) {
module('kibana');
ngMock.module('kibana');
// Stub services
module(function ($provide) {
ngMock.module(function ($provide) {
$provide.service('$route', function (Private) {
this.current = {
locals: {
@ -65,7 +66,7 @@ define(function (require) {
});
// Create the scope
inject(function ($rootScope, $controller, _timefilter_) {
ngMock.inject(function ($rootScope, $controller, _timefilter_) {
$scope = $rootScope.$new();
timefilter = _timefilter_;

5
src/plugins/kibana/public/visualize/editor/__tests__/agg.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var $ = require('jquery');
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('plugins/kibana/visualize/editor/agg');
@ -42,7 +43,7 @@ define(function (require) {
};
}
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
$parentScope.agg = {
@ -59,7 +60,7 @@ define(function (require) {
schema: makeConfig('radius')
}];
});
beforeEach(inject(function ($rootScope, $compile) {
beforeEach(ngMock.inject(function ($rootScope, $compile) {
// share the scope
_.defaults($parentScope, $rootScope, Object.getPrototypeOf($rootScope));

5
src/plugins/markdown_vis/public/__tests__/markdown_vis_controller.js
View file

@ -1,10 +1,11 @@
define(function (require) {
describe('markdown vis controller', function () {
var $scope, $el;
var ngMock = require('ngMock');
var expect = require('expect.js');
beforeEach(module('kibana/markdown_vis'));
beforeEach(inject(function ($rootScope, $controller) {
beforeEach(ngMock.module('kibana/markdown_vis'));
beforeEach(ngMock.inject(function ($rootScope, $controller) {
$scope = $rootScope.$new();
$controller('KbnMarkdownVisController', {$scope: $scope});
$scope.$digest();

5
src/plugins/metric_vis/public/__tests__/metric_vis_controller.js
View file

@ -1,14 +1,15 @@
define(function (require) {
describe('metric vis', function () {
var $scope;
var ngMock = require('ngMock');
var expect = require('expect.js');
var formatter = function (value) {
return value.toFixed(3);
};
beforeEach(module('kibana/metric_vis'));
beforeEach(inject(function ($rootScope, $controller) {
beforeEach(ngMock.module('kibana/metric_vis'));
beforeEach(ngMock.inject(function ($rootScope, $controller) {
$scope = $rootScope.$new();
$controller('KbnMetricVisController', {$scope: $scope});
$scope.$digest();

5
src/plugins/table_vis/public/__tests__/_table_vis.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var $ = require('jquery');
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var sinon = require('auto-release-sinon/mocha');
var $rootScope;
@ -14,8 +15,8 @@ define(function (require) {
var indexPattern;
var fixtures;
beforeEach(module('kibana', 'kibana/table_vis'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
beforeEach(ngMock.inject(function (Private, $injector) {
$rootScope = $injector.get('$rootScope');
$compile = $injector.get('$compile');
fixtures = require('fixtures/fake_hierarchical_data');

5
src/plugins/table_vis/public/__tests__/_table_vis_controller.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var $ = require('jquery');
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var sinon = require('auto-release-sinon/mocha');
var $rootScope;
@ -14,8 +15,8 @@ define(function (require) {
var Vis;
var fixtures;
beforeEach(module('kibana', 'kibana/table_vis'));
beforeEach(inject(function ($injector) {
beforeEach(ngMock.module('kibana', 'kibana/table_vis'));
beforeEach(ngMock.inject(function ($injector) {
Private = $injector.get('Private');
$rootScope = $injector.get('$rootScope');
$compile = $injector.get('$compile');

3
src/server/optimize/BaseOptimizer.js
View file

@ -63,8 +63,7 @@ class BaseOptimizer extends EventEmitter {
{ test: /\.(html|tmpl)$/, loader: 'raw' },
{ test: /\.png$/, loader: 'url?limit=2048!file?name=[path][name].[ext]' },
{ test: /\.(woff|woff2|ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: 'file?name=[path][name].[ext]' },
{ test: /\/src\/(plugins|ui)\/.+\.js$/, loader: 'auto-preload-rjscommon-deps' },
{ test: /\/__tests__\//, loader: 'mocha' }
{ test: /\/src\/(plugins|ui)\/.+\.js$/, loader: 'auto-preload-rjscommon-deps' }
].concat(this.modules.loaders),
noParse: this.modules.noParse,
},

6
src/server/optimize/LiveOptimizer.js
View file

@ -28,7 +28,8 @@ module.exports = class LiveOptimizer extends BaseOptimizer {
let self = this;
let fs = self.outFs;
let filename = join(self.compiler.outputPath, `${id}.bundle.js`);
let mapFilename = filename + '.map';
let mapFilename = join(self.compiler.outputPath, `${id}.bundle.js.map`);
let styleFilename = join(self.compiler.outputPath, `${id}.style.css`);
self.active = (self.active || self.compile().finally(function () {
self.active = null;
@ -43,7 +44,8 @@ module.exports = class LiveOptimizer extends BaseOptimizer {
try {
return {
bundle: fs.readFileSync(filename),
map: self.sourceMaps ? fs.readFileSync(mapFilename) : false
sourceMap: self.sourceMaps ? fs.readFileSync(mapFilename) : false,
style: fs.readFileSync(styleFilename)
};
} catch (e) {
return null;

5
src/server/ui/helpers.js
View file

@ -1,7 +1,7 @@
module.exports = function (kbnServer, server, config) {
var _ = require('lodash');
server.decorate('reply', 'renderApp', function (app) {
server.decorate('reply', 'renderApp', function (app, view) {
var optimizeStatus = kbnServer.status.get('optimize');
switch (optimizeStatus && optimizeStatus.state) {
@ -22,7 +22,6 @@ module.exports = function (kbnServer, server, config) {
var payload = {
app: app,
angularModules: app.getModules().angular,
appCount: kbnServer.uiExports.apps.length,
version: kbnServer.version,
buildSha: _.get(kbnServer, 'build.sha', '@@buildSha'),
@ -32,7 +31,7 @@ module.exports = function (kbnServer, server, config) {
esShardTimeout: config.get('elasticsearch.shardTimeout')
};
return this.view('bootstrap', {
return this.view(view || 'uiApp', {
app: app,
cacheBust: payload.cacheBust,
kibanaPayload: payload

4
src/server/ui/views/bootstrap.jade → src/server/ui/views/chrome.jade
View file

@ -8,7 +8,7 @@ html(lang='en')
meta(name='viewport', content='width=device-width')
link(rel='shortcut icon', href='/ui/images/elk.ico')
title Kibana
link(rel='stylesheet', href='/bundles/#{app.id}.style.css')
block head
body(kbn-chrome)
script window.__KBN__ = !{j(kibanaPayload)};
script(src='/bundles/#{app.id}.bundle.js')
block content

7
src/server/ui/views/uiApp.jade Normal file
View file

@ -0,0 +1,7 @@
extends ./chrome.jade
block head
link(rel='stylesheet', href='/bundles/#{app.id}.style.css')
block content
script(src='/bundles/#{app.id}.bundle.js')

5
src/ui/agg_response/geo_json/__tests__/geo_json.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('GeoJson Agg Response Converter', function () {
var vis;
@ -9,8 +10,8 @@ define(function (require) {
var esResponse;
var aggs;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
var Vis = Private(require('ui/vis/vis'));
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_response/hierarchical/__tests__/build_hierarchical_data.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var fixtures = require('fixtures/fake_hierarchical_data');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var Vis;
var Notifier;
@ -12,8 +13,8 @@ define(function (require) {
describe('buildHierarchicalData()', function () {
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
// stub the error method before requiring vis causes Notifier#error to be bound
Notifier = $injector.get('Notifier');
sinon.stub(Notifier.prototype, 'error');

5
src/ui/agg_response/hierarchical/__tests__/create_raw_data.js
View file

@ -4,6 +4,7 @@ define(function (require) {
var createRawData = require('ui/agg_response/hierarchical/_create_raw_data');
var arrayToLinkedList = require('ui/agg_response/hierarchical/_array_to_linked_list');
var expect = require('expect.js');
var ngMock = require('ngMock');
var AggConfigs;
var Vis;
@ -13,9 +14,9 @@ define(function (require) {
describe('createRawData()', function () {
var vis, results;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfigs = Private(require('ui/vis/AggConfigs'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_response/hierarchical/__tests__/transform_aggregation.js
View file

@ -3,11 +3,12 @@ define(function (require) {
describe('transformAggregation()', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var transform;
var fixture;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
transform = Private(require('ui/agg_response/hierarchical/_transform_aggregation'));
}));

5
src/ui/agg_response/point_series/__tests__/_add_to_siri.js
View file

@ -1,10 +1,11 @@
define(function (require) {
return ['addToSiri', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
var addToSiri;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
addToSiri = Private(require('ui/agg_response/point_series/_add_to_siri'));
}));

5
src/ui/agg_response/point_series/__tests__/_fake_x_aspect.js
View file

@ -7,9 +7,10 @@ define(function (require) {
var AggConfig;
var indexPattern;
var expect = require('expect.js');
var ngMock = require('ngMock');
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
AggType = Private(require('ui/agg_types/_agg_type'));

5
src/ui/agg_response/point_series/__tests__/_get_aspects.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
var Vis;
var Table;
@ -10,8 +11,8 @@ define(function (require) {
var indexPattern;
var getAspects;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
Table = Private(require('ui/agg_response/point_series/_add_to_siri'));
AggConfig = Private(require('ui/vis/AggConfig'));

5
src/ui/agg_response/point_series/__tests__/_get_point.js
View file

@ -3,14 +3,15 @@ define(function (require) {
return ['getPoint', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var getPoint;
var truthFormatted = { fieldFormatter: _.constant(_.constant(true)) };
var identFormatted = { fieldFormatter: _.constant(_.identity) };
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
getPoint = Private(require('ui/agg_response/point_series/_get_point'));
}));

5
src/ui/agg_response/point_series/__tests__/_get_series.js
View file

@ -2,12 +2,13 @@ define(function (require) {
return ['getSeries', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var getSeries;
var agg = { fieldFormatter: _.constant(_.identity) };
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
getSeries = Private(require('ui/agg_response/point_series/_get_series'));
}));

5
src/ui/agg_response/point_series/__tests__/_init_x_axis.js
View file

@ -2,11 +2,12 @@ define(function (require) {
return ['initXAxis', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var initXAxis;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
initXAxis = Private(require('ui/agg_response/point_series/_init_x_axis'));
}));

5
src/ui/agg_response/point_series/__tests__/_init_y_axis.js
View file

@ -2,11 +2,12 @@ define(function (require) {
return ['initYAxis', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var initYAxis;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
initYAxis = Private(require('ui/agg_response/point_series/_init_y_axis'));
}));

5
src/ui/agg_response/point_series/__tests__/_main.js
View file

@ -6,14 +6,15 @@ define(function (require) {
var moment = require('moment');
var AggConfigResult = require('ui/vis/AggConfigResult');
var expect = require('expect.js');
var ngMock = require('ngMock');
var pointSeriesChartDataFromTable;
var indexPattern;
var Table;
var Vis;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
Table = Private(require('ui/agg_response/tabify/_table'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_response/point_series/__tests__/_ordered_date_axis.js
View file

@ -4,6 +4,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var baseArgs = {
vis: {
@ -29,8 +30,8 @@ define(function (require) {
var orderedDateAxis;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
orderedDateAxis = Private(require('ui/agg_response/point_series/_ordered_date_axis'));
}));

5
src/ui/agg_response/point_series/__tests__/_tooltip_formatter.js
View file

@ -3,11 +3,12 @@ define(function (require) {
var _ = require('lodash');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
var tooltipFormatter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
tooltipFormatter = Private(require('ui/agg_response/point_series/_tooltip_formatter'));
}));

5
src/ui/agg_response/tabify/__tests__/_buckets.js
View file

@ -2,9 +2,10 @@ define(function (require) {
return ['Buckets wrapper', function () {
var Buckets;
var expect = require('expect.js');
var ngMock = require('ngMock');
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
Buckets = Private(require('ui/agg_response/tabify/_buckets'));
}));

5
src/ui/agg_response/tabify/__tests__/_get_columns.js
View file

@ -4,9 +4,10 @@ define(function (require) {
var Vis;
var indexPattern;
var expect = require('expect.js');
var ngMock = require('ngMock');
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
getColumns = Private(require('ui/agg_response/tabify/_get_columns'));
Vis = Private(require('ui/vis/vis'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_response/tabify/__tests__/_integration.js
View file

@ -3,14 +3,15 @@ define(function (require) {
var _ = require('lodash');
var fixtures = require('fixtures/fake_hierarchical_data');
var expect = require('expect.js');
var ngMock = require('ngMock');
var Vis;
var Buckets;
var indexPattern;
var tabifyAggResponse;
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
Vis = Private(require('ui/vis/vis'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_response/tabify/__tests__/_response_writer.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var Vis;
var Table;
@ -14,8 +15,8 @@ define(function (require) {
var ResponseWriter;
function defineSetup(stubGetColumns) {
beforeEach(module('kibana'));
beforeEach(inject(function ($injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector) {
Private = $injector.get('Private');
if (stubGetColumns) {

5
src/ui/agg_response/tabify/__tests__/_table.js
View file

@ -2,11 +2,12 @@ define(function (require) {
return ['Table class', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var Table;
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
Table = Private(require('ui/agg_response/tabify/_table'));
}));

5
src/ui/agg_response/tabify/__tests__/_table_group.js
View file

@ -2,9 +2,10 @@ define(function (require) {
return ['Table Group class', function () {
var TableGroup;
var expect = require('expect.js');
var ngMock = require('ngMock');
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
TableGroup = Private(require('ui/agg_response/tabify/_table_group'));
}));

5
src/ui/agg_table/__tests__/_group.js
View file

@ -2,6 +2,7 @@ define(function (require) {
return ['AggTableGroup Directive', function () {
var _ = require('lodash');
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
var fixtures = require('fixtures/fake_hierarchical_data');
@ -11,8 +12,8 @@ define(function (require) {
var Vis;
var indexPattern;
beforeEach(module('kibana'));
beforeEach(inject(function ($injector, Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector, Private) {
tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
Vis = Private(require('ui/vis/vis'));

5
src/ui/agg_table/__tests__/_table.js
View file

@ -2,6 +2,7 @@ define(function (require) {
return ['AggTable Directive', function () {
var _ = require('lodash');
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
var fixtures = require('fixtures/fake_hierarchical_data');
var sinon = require('auto-release-sinon/mocha');
@ -12,8 +13,8 @@ define(function (require) {
var Vis;
var indexPattern;
beforeEach(module('kibana'));
beforeEach(inject(function ($injector, Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector, Private) {
tabifyAggResponse = Private(require('ui/agg_response/tabify/tabify'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
Vis = Private(require('ui/vis/vis'));

7
src/ui/agg_types/__tests__/_agg_params.js
View file

@ -1,6 +1,7 @@
define(function (require) {
return ['AggParams class', function () {
var _ = require('lodash');
var ngMock = require('ngMock');
var expect = require('expect.js');
var AggParams;
@ -9,11 +10,11 @@ define(function (require) {
var OptionedAggParam;
var RegexAggParam;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
// stub out the param classes before we get the AggParams
beforeEach(inject(require('specs/components/agg_types/utils/_stub_agg_params')));
beforeEach(ngMock.inject(require('specs/components/agg_types/utils/_stub_agg_params')));
// fetch out deps
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
AggParams = Private(require('ui/agg_types/_agg_params'));
BaseAggParam = Private(require('ui/agg_types/param_types/base'));
FieldAggParam = Private(require('ui/agg_types/param_types/field'));

5
src/ui/agg_types/__tests__/_agg_type.js
View file

@ -2,6 +2,7 @@ define(function (require) {
return ['AggType Class', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var sinon = require('auto-release-sinon/mocha');
var AggType;
var AggParams;
@ -12,8 +13,8 @@ define(function (require) {
require('ui/private');
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
var AggParamsPM = require('ui/agg_types/_agg_params');
AggParams = sinon.spy(Private(AggParamsPM));
Private.stub(AggParamsPM, AggParams);

5
src/ui/agg_types/__tests__/_bucket_count_between.js
View file

@ -2,6 +2,7 @@ define(function (require) {
return ['bucketCountBetween util', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var indexPattern;
var Vis;
var visTypes;
@ -15,8 +16,8 @@ define(function (require) {
return ((n = +n) || 1 / n) < 0;
}
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
Vis = Private(require('ui/vis/vis'));
visTypes = Private(require('registry/vis_types'));

9
src/ui/agg_types/__tests__/buckets/_histogram.js
View file

@ -2,12 +2,13 @@ define(function (require) {
return ['Histogram Agg', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('ordered', function () {
var histogram;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
histogram = Private(require('ui/agg_types/index')).byName.histogram;
}));
@ -24,8 +25,8 @@ define(function (require) {
describe('params', function () {
var paramWriter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
var AggParamWriter = Private(require('../aggParamWriter'));
paramWriter = new AggParamWriter({ aggType: 'histogram' });
}));

5
src/ui/agg_types/__tests__/buckets/create_filter/date_histogram.js
View file

@ -5,6 +5,7 @@ define(function (require) {
var moment = require('moment');
var sinon = require('auto-release-sinon/mocha');
var aggResp = require('fixtures/agg_resp/date_histogram');
var ngMock = require('ngMock');
var expect = require('expect.js');
var vis;
@ -18,8 +19,8 @@ define(function (require) {
var init;
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
var Vis = Private(require('ui/vis/vis'));
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var createFilter = Private(require('ui/agg_types/buckets/create_filter/date_histogram'));

6
src/ui/agg_types/__tests__/buckets/create_filter/date_range.js
View file

@ -1,6 +1,8 @@
define(function (require) {
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('AggConfig Filters', function () {
describe('Date range', function () {
var AggConfig;
@ -8,8 +10,8 @@ define(function (require) {
var Vis;
var createFilter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

6
src/ui/agg_types/__tests__/buckets/create_filter/filters.js
View file

@ -1,6 +1,8 @@
define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('AggConfig Filters', function () {
describe('filters', function () {
var AggConfig;
@ -8,8 +10,8 @@ define(function (require) {
var Vis;
var createFilter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_types/__tests__/buckets/create_filter/histogram.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('AggConfig Filters', function () {
describe('histogram', function () {
@ -9,8 +10,8 @@ define(function (require) {
var Vis;
var createFilter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

6
src/ui/agg_types/__tests__/buckets/create_filter/ip_range.js
View file

@ -1,14 +1,16 @@
define(function (require) {
describe('AggConfig Filters', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('IP range', function () {
var AggConfig;
var indexPattern;
var Vis;
var createFilter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

6
src/ui/agg_types/__tests__/buckets/create_filter/range.js
View file

@ -1,14 +1,16 @@
define(function (require) {
describe('AggConfig Filters', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('range', function () {
var AggConfig;
var indexPattern;
var Vis;
var createFilter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

6
src/ui/agg_types/__tests__/buckets/create_filter/terms.js
View file

@ -1,14 +1,16 @@
define(function (require) {
describe('AggConfig Filters', function () {
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('terms', function () {
var AggConfig;
var indexPattern;
var Vis;
var createFilter;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

7
src/ui/agg_types/__tests__/buckets/date_histogram/_editor.js
View file

@ -2,6 +2,7 @@ define(function (require) {
return ['editor', function () {
var _ = require('lodash');
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
var indexPattern;
@ -10,8 +11,8 @@ define(function (require) {
var render;
var $scope;
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector, $compile) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector, $compile) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var Vis = Private(require('ui/vis/vis'));
@ -70,7 +71,7 @@ define(function (require) {
var field;
var interval;
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
field = _.sample(indexPattern.fields);
interval = _.sample(Private(require('ui/agg_types/buckets/_interval_options')));
params = render({ field: field, interval: interval });

5
src/ui/agg_types/__tests__/buckets/date_histogram/_params.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
var paramWriter;
var writeInterval;
@ -12,8 +13,8 @@ define(function (require) {
var setTimeBounds;
var timeField;
beforeEach(module('kibana'));
beforeEach(inject(function (Private, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, $injector) {
var AggParamWriter = Private(require('../../aggParamWriter'));
var indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
var timefilter = $injector.get('timefilter');

5
src/ui/agg_types/__tests__/controls/number_list.js
View file

@ -4,6 +4,7 @@ define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var simulateKeys = require('testUtils/simulateKeys');
var ngMock = require('ngMock');
require('ui/number_list/number_list');
@ -18,8 +19,8 @@ define(function (require) {
});
}
beforeEach(module('kibana'));
beforeEach(inject(function ($injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector) {
var $compile = $injector.get('$compile');
var $rootScope = $injector.get('$rootScope');

9
src/ui/agg_types/__tests__/index.js
View file

@ -1,5 +1,6 @@
define(function (require) {
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('AggTypesComponent', function () {
describe(require('specs/components/agg_types/_agg_type'));
@ -11,8 +12,8 @@ define(function (require) {
var bucketAggs;
var BucketAggType;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
bucketAggs = Private(require('ui/agg_types/index')).byType.buckets;
BucketAggType = Private(require('ui/agg_types/buckets/_bucket_agg_type'));
}));
@ -28,8 +29,8 @@ define(function (require) {
var metricAggs;
var MetricAggType;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
metricAggs = Private(require('ui/agg_types/index')).byType.metrics;
MetricAggType = Private(require('ui/agg_types/metrics/_metric_agg_type'));
}));

6
src/ui/agg_types/__tests__/param_types/_calculate_interval.js
View file

@ -1,6 +1,8 @@
define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('calculateInterval()', function () {
var AggConfig;
var indexPattern;
@ -8,8 +10,8 @@ define(function (require) {
var createFilter;
var calculateInterval;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
Vis = Private(require('ui/vis/vis'));
AggConfig = Private(require('ui/vis/AggConfig'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/agg_types/__tests__/param_types/_field.js
View file

@ -2,13 +2,14 @@ define(function (require) {
return ['Field', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var BaseAggParam;
var FieldAggParam;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
// fetch out deps
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
BaseAggParam = Private(require('ui/agg_types/param_types/base'));
FieldAggParam = Private(require('ui/agg_types/param_types/field'));
}));

5
src/ui/agg_types/__tests__/param_types/_optioned.js
View file

@ -2,13 +2,14 @@ define(function (require) {
return ['Optioned', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var BaseAggParam;
var OptionedAggParam;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
// fetch out deps
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
BaseAggParam = Private(require('ui/agg_types/param_types/base'));
OptionedAggParam = Private(require('ui/agg_types/param_types/optioned'));
}));

5
src/ui/agg_types/__tests__/param_types/_raw_json.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
return ['JSON', function () {
@ -21,10 +22,10 @@ define(function (require) {
aggParam = new JsonAggParam(_.defaults(config, defaults));
}
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
// fetch out deps
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
aggConfig = { params: {} };
output = { params: {} };

5
src/ui/agg_types/__tests__/param_types/_regex.js
View file

@ -2,15 +2,16 @@ define(function (require) {
return ['Regex', function () {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
var BaseAggParam;
var RegexAggParam;
var Vis;
var indexPattern;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
// fetch out deps
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
BaseAggParam = Private(require('ui/agg_types/param_types/base'));
RegexAggParam = Private(require('ui/agg_types/param_types/regex'));
Vis = Private(require('ui/vis/vis'));

5
src/ui/agg_types/__tests__/param_types/_string.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var _ = require('lodash');
var expect = require('expect.js');
var ngMock = require('ngMock');
return ['String', function () {
var paramName = 'json_test';
@ -20,10 +21,10 @@ define(function (require) {
aggParam = new StringAggParam(_.defaults(config, defaults));
}
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
// fetch our deps
beforeEach(inject(function (Private) {
beforeEach(ngMock.inject(function (Private) {
BaseAggParam = Private(require('ui/agg_types/param_types/base'));
StringAggParam = Private(require('ui/agg_types/param_types/string'));

6
src/ui/agg_types/__tests__/utils/_stub_agg_params.js
View file

@ -12,16 +12,16 @@ define(function (require) {
/**
* stub all of the param classes, but ensure that they still inherit properly.
* This method should be passed directly to inject();
* This method should be passed directly to ngMock.inject();
*
* ```js
* var stubParamClasses = require('specs/components/agg_types/utils/_stub_agg_params');
* describe('something', function () {
* beforeEach(inject(stubParamClasses));
* beforeEach(ngMock.inject(stubParamClasses));
* })
* ```
*
* @param {PrivateLoader} Private - The private module loader, inject by passing this function to inject()
* @param {PrivateLoader} Private - The private module loader, inject by passing this function to ngMock.inject()
* @return {undefined}
*/
return function stubParamClasses(Private) {

5
src/ui/bind/__tests__/bind.js
View file

@ -2,12 +2,13 @@ define(function (require) {
describe('$scope.$bind', function () {
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var $rootScope;
var $scope;
beforeEach(module('kibana'));
beforeEach(inject(function ($injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector) {
$rootScope = $injector.get('$rootScope');
$scope = $rootScope.$new();
}));

20
src/ui/chrome/chrome.js
View file

@ -202,14 +202,8 @@ define(function (require) {
return tab ? tab.id : def;
};
/**
* Get the id of the active tab
*
* @param {*} def - the default value if there isn't any active tab
* @return {*}
*/
chrome.bootstrap = function (angularModules) {
var kibana = modules.get('kibana', angularModules);
chrome.setupAngular = function (moduleDeps) {
var kibana = modules.get('kibana', moduleDeps);
kibana
.constant('kbnVersion', payload.version)
@ -227,6 +221,16 @@ define(function (require) {
.constant('sessionId', Date.now());
modules.link(kibana);
};
/**
* Get the id of the active tab
*
* @param {*} def - the default value if there isn't any active tab
* @return {*}
*/
chrome.bootstrap = function (angularModules) {
chrome.setupAngular(angularModules);
angular.bootstrap(document, ['kibana']);
$(document.body).children(':not(style-compile)').show();
};

5
src/ui/clipboard/__tests__/clipboard.js
View file

@ -4,6 +4,7 @@ define(function (require) {
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var $ = require('jquery');
var ngMock = require('ngMock');
require('ui/clipboard/clipboard');
@ -17,9 +18,9 @@ define(function (require) {
function init() {
// load the application
module('kibana');
ngMock.module('kibana');
inject(function (_$rootScope_, _$compile_, _$interpolate_) {
ngMock.inject(function (_$rootScope_, _$compile_, _$interpolate_) {
$rootScope = _$rootScope_;
$compile = _$compile_;
$interpolate = _$interpolate_;

5
src/ui/config/__tests__/config.js
View file

@ -4,9 +4,10 @@ define(function (require) {
var config;
var defaults;
var expect = require('expect.js');
var ngMock = require('ngMock');
beforeEach(module('kibana'));
beforeEach(inject(function ($injector, Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector, Private) {
config = $injector.get('config');
$scope = $injector.get('$rootScope');
defaults = Private(require('ui/config/defaults'));

8
src/ui/courier/data_source/__tests__/decorate_query.js
View file

@ -1,6 +1,8 @@
define(function (require) {
var moment = require('moment');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('Query decorator', function () {
var _ = require('lodash');
@ -8,9 +10,9 @@ define(function (require) {
var indexPattern, getComputedFields, fn;
beforeEach(function () {
module('kibana');
ngMock.module('kibana');
module('kibana', function ($provide) {
ngMock.module('kibana', function ($provide) {
// Super simple config stub
$provide.service('config', function () {
@ -23,7 +25,7 @@ define(function (require) {
});
});
beforeEach(inject(function (Private, $injector, _config_) {
beforeEach(ngMock.inject(function (Private, $injector, _config_) {
config = _config_;
fn = Private(require('ui/courier/data_source/_decorate_query'));
}));

5
src/ui/courier/data_source/__tests__/normalize_sort_request.js
View file

@ -2,14 +2,15 @@ define(function (require) {
describe('SearchSource#normalizeSortRequest', function () {
require('ui/private');
require('angular').module('normalizeSortRequest', ['kibana']);
var ngMock = require('ngMock');
var expect = require('expect.js');
var normalizeSortRequest;
var indexPattern;
var normalizedSort;
beforeEach(module('kibana'));
beforeEach(inject(function (Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private) {
normalizeSortRequest = Private(require('ui/courier/data_source/_normalize_sort_request'));
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));

5
src/ui/courier/fetch/__tests__/doc.js
View file

@ -2,6 +2,7 @@ define(function (require) {
describe('Courier DocFetchRequest class', function () {
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var storage;
var source;
@ -10,8 +11,8 @@ define(function (require) {
var setVersion;
beforeEach(module('kibana'));
beforeEach(inject(function (Private, Promise, $injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (Private, Promise, $injector) {
var DocSource = Private(require('ui/courier/data_source/doc_source'));
var DocFetchRequest = Private(require('ui/courier/fetch/request/doc'));

5
src/ui/debounce/__tests__/debounce.js
View file

@ -1,15 +1,16 @@
define(function (require) {
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var debounce;
var $timeout;
var $timeoutSpy;
function init() {
module('kibana');
ngMock.module('kibana');
inject(function ($injector, _$timeout_) {
ngMock.inject(function ($injector, _$timeout_) {
$timeout = _$timeout_;
$timeoutSpy = sinon.spy($timeout);

5
src/ui/directives/__tests__/auto_select_if_only_one.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/auto_select_if_only_one');
describe('Auto-select if only one directive', function () {
@ -10,9 +11,9 @@ define(function (require) {
var oneOption = [{label: 'foo'}];
var multiOptions = [{label: 'foo'}, {label: 'bar'}];
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
$compile(html)($rootScope);

5
src/ui/directives/__tests__/confirm-click.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var $ = require('jquery');
var sinon = require('sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/confirm_click');
@ -15,10 +16,10 @@ define(function (require) {
var init = function (text) {
// Load the application
module('kibana');
ngMock.module('kibana');
// Create the scope
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;

5
src/ui/directives/__tests__/css_truncate.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('angular-route');
require('plugins/kibana/discover/index');
@ -10,10 +11,10 @@ define(function (require) {
var init = function (expandable) {
// Load the application
module('kibana');
ngMock.module('kibana');
// Create the scope
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;

5
src/ui/directives/__tests__/fixedScroll.js
View file

@ -1,6 +1,7 @@
define(function (require) {
require('ui/fixedScroll');
var expect = require('expect.js');
var ngMock = require('ngMock');
describe('FixedScroll directive', function () {
var $ = require('jquery');
@ -10,8 +11,8 @@ define(function (require) {
var compile;
var trash = [];
beforeEach(module('kibana'));
beforeEach(inject(function ($compile, $rootScope) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($compile, $rootScope) {
compile = function (ratioY, ratioX) {
if (ratioX == null) ratioX = ratioY;

5
src/ui/directives/__tests__/inequality.js
View file

@ -1,15 +1,16 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/inequality');
describe('greater_than model validator directive', function () {
var $compile, $rootScope;
var html;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
}));

5
src/ui/directives/__tests__/input_focus.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/input_focus');
describe('Input focus directive', function () {
@ -9,8 +10,8 @@ define(function (require) {
var $el, selectedEl, selectedText;
var inputValue = 'Input Text Value';
beforeEach(module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_, _$timeout_) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_, _$timeout_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
$timeout = _$timeout_;

5
src/ui/directives/__tests__/input_whole_number.js
View file

@ -1,15 +1,16 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/input_whole_number');
describe('Whole number input directive', function () {
var $compile, $rootScope;
var html = '<input type="text" ng-model="value" input-whole-number />';
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
}));

5
src/ui/directives/__tests__/spinner.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('angular-route');
@ -12,10 +13,10 @@ define(function (require) {
var init = function () {
// Load the application
module('kibana');
ngMock.module('kibana');
// Create the scope
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;

7
src/ui/directives/__tests__/timepicker.js
View file

@ -5,6 +5,7 @@ define(function (require) {
var _ = require('lodash');
var $ = require('jquery');
var sinon = require('auto-release-sinon/mocha');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
@ -22,13 +23,13 @@ define(function (require) {
var init = function () {
// Load the application
module('kibana');
ngMock.module('kibana');
// Stub out the clock so 'now' doesn't move
clock = sinon.useFakeTimers(moment(anchor).valueOf());
// Create the scope
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;
@ -88,7 +89,7 @@ define(function (require) {
var $courier;
beforeEach(function () {
init();
inject(function (courier, $rootScope) {
ngMock.inject(function (courier, $rootScope) {
$courier = courier;
$rootScope.$apply();
});

5
src/ui/directives/__tests__/truncate.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var angular = require('angular');
var $ = require('jquery');
var expect = require('expect.js');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('angular-route');
@ -12,10 +13,10 @@ define(function (require) {
var init = function (text) {
// Load the application
module('kibana');
ngMock.module('kibana');
// Create the scope
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;

7
src/ui/directives/__tests__/typeahead.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var angular = require('angular');
var sinon = require('sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('angular-route');
@ -25,9 +26,9 @@ define(function (require) {
var init = function () {
// Load the application
module('kibana');
ngMock.module('kibana');
module('kibana/typeahead', function ($provide) {
ngMock.module('kibana/typeahead', function ($provide) {
$provide.factory('PersistedLog', function () {
function PersistedLogMock(name, options) {
this.name = name;
@ -47,7 +48,7 @@ define(function (require) {
// Create the scope
inject(function ($injector, $controller, $rootScope, $compile) {
ngMock.inject(function ($injector, $controller, $rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;

6
src/ui/directives/__tests__/validate_cidr_mask.js
View file

@ -1,15 +1,17 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/validate_cidr_mask');
describe('Validate CIDR mask directive', function () {
var $compile, $rootScope;
var html = '<input type="text" ng-model="value" validate-cidr-mask />';
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
}));

6
src/ui/directives/__tests__/validate_date_math.js
View file

@ -1,15 +1,17 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/validate_date_math');
describe('Validate date math directive', function () {
var $compile, $rootScope;
var html = '<input type="text" ng-model="value" validate-date-math />';
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
}));

5
src/ui/directives/__tests__/validate_index_name.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/directives/validate_index_name');
@ -9,9 +10,9 @@ define(function (require) {
var $compile, $rootScope;
var html = '<input type="text" ng-model="indexName" validate-index-name />';
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
}));

6
src/ui/directives/__tests__/validate_ip.js
View file

@ -1,15 +1,17 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/directives/validate_ip');
describe('Validate IP directive', function () {
var $compile, $rootScope;
var html = '<input type="text" ng-model="value" validate-ip />';
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (_$compile_, _$rootScope_) {
beforeEach(ngMock.inject(function (_$compile_, _$rootScope_) {
$compile = _$compile_;
$rootScope = _$rootScope_;
}));

5
src/ui/directives/__tests__/validate_json.js
View file

@ -1,6 +1,7 @@
define(function (require) {
var angular = require('angular');
var expect = require('expect.js');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/directives/validate_json');
@ -22,12 +23,12 @@ define(function (require) {
var init = function (type) {
// Load the application
module('kibana');
ngMock.module('kibana');
type = type || 'input';
var elMarkup = markup[type];
// Create the scope
inject(function ($injector, $rootScope, $compile) {
ngMock.inject(function ($injector, $rootScope, $compile) {
// Give us a scope
$parentScope = $rootScope;
$parentScope.mockModel = mockScope;

7
src/ui/directives/__tests__/validate_query.js
View file

@ -2,6 +2,7 @@ define(function (require) {
var angular = require('angular');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/validate_query/validate_query');
@ -37,9 +38,9 @@ define(function (require) {
var init = function () {
// Load the application
module('kibana');
ngMock.module('kibana');
module('kibana', function ($provide) {
ngMock.module('kibana', function ($provide) {
$provide.service('es', function () {
return { indices: { validateQuery: function () {} } };
});
@ -57,7 +58,7 @@ define(function (require) {
});
// Create the scope
inject(function ($injector, _$rootScope_, _$compile_, _$timeout_, _Promise_, _Private_, _config_) {
ngMock.inject(function ($injector, _$rootScope_, _$compile_, _$timeout_, _Promise_, _Private_, _config_) {
$timeout = _$timeout_;
$compile = _$compile_;
Promise = _Promise_;

7
src/ui/doc_table/__tests__/doc_table.js
View file

@ -5,6 +5,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var searchResponse = require('fixtures/search_response');
var ngMock = require('ngMock');
// Load the kibana app dependencies.
require('ui/private');
@ -14,7 +15,7 @@ define(function (require) {
var $parentScope, $scope, $timeout, searchSource;
var init = function ($elem, props) {
inject(function ($rootScope, $compile, _$timeout_) {
ngMock.inject(function ($rootScope, $compile, _$timeout_) {
$timeout = _$timeout_;
$parentScope = $rootScope;
_.assign($parentScope, props);
@ -39,10 +40,10 @@ define(function (require) {
describe('docTable', function () {
var $elem;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
$elem = angular.element('<doc-table search-source="searchSource" columns="columns" sorting="sorting"></doc-table>');
inject(function (Private) {
ngMock.inject(function (Private) {
searchSource = Private(require('fixtures/stubbed_search_source'));
});
init($elem, {

5
src/ui/doc_table/__tests__/lib/get_sort.js
View file

@ -2,12 +2,13 @@ define(function (require) {
var getSort = require('ui/doc_table/lib/get_sort');
var defaultSort = {time: 'desc'};
var expect = require('expect.js');
var ngMock = require('ngMock');
var indexPattern;
describe('docTable', function () {
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(inject(function (Private, _$rootScope_, Promise) {
beforeEach(ngMock.inject(function (Private, _$rootScope_, Promise) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
}));

9
src/ui/doc_table/__tests__/lib/rows_headers.js
View file

@ -4,6 +4,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var getFakeRow = require('fixtures/fake_row');
describe('Doc Table', function () {
@ -18,8 +19,8 @@ define(function (require) {
// Stub out a minimal mapping of 4 fields
var mapping;
beforeEach(module('kibana', 'apps/discover'));
beforeEach(inject(function (_config_, $rootScope, Private) {
beforeEach(ngMock.module('kibana', 'apps/discover'));
beforeEach(ngMock.inject(function (_config_, $rootScope, Private) {
config = _config_;
$parentScope = $rootScope;
$parentScope.indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
@ -28,7 +29,7 @@ define(function (require) {
// Sets up the directive, take an element, and a list of properties to attach to the parent scope.
var init = function ($elem, props) {
inject(function ($compile) {
ngMock.inject(function ($compile) {
_.assign($parentScope, props);
$compile($elem)($parentScope);
$elem.scope().$digest();
@ -316,7 +317,7 @@ define(function (require) {
var $root;
var $before;
beforeEach(inject(function ($rootScope, $compile, Private) {
beforeEach(ngMock.inject(function ($rootScope, $compile, Private) {
$root = $rootScope;
$root.row = getFakeRow(0, mapping);
$root.columns = ['_source'];

5
src/ui/doc_title/__tests__/doc_title.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var initialDocTitle;
var MAIN_TITLE = 'Kibana 4';
var fakeApp = { name: 'fancy pants' };
@ -18,12 +19,12 @@ define(function (require) {
document.title = initialDocTitle;
});
beforeEach(module('kibana', function ($provide) {
beforeEach(ngMock.module('kibana', function ($provide) {
$provide.decorator('docTitle', decorateWithSpy('update'));
$provide.decorator('$rootScope', decorateWithSpy('$on'));
}));
beforeEach(inject(function ($injector, Private) {
beforeEach(ngMock.inject(function ($injector, Private) {
if (_.random(0, 1)) {
docTitle = $injector.get('docTitle');
} else {

7
src/ui/doc_viewer/__tests__/doc_viewer.js
View file

@ -4,6 +4,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var hit = {
'_index': 'logstash-2014.09.09',
'_type': 'apache',
@ -27,7 +28,7 @@ define(function (require) {
var $parentScope, $scope, indexPattern, flattened;
var init = function ($elem, props) {
inject(function ($rootScope, $compile) {
ngMock.inject(function ($rootScope, $compile) {
$parentScope = $rootScope;
_.assign($parentScope, props);
$compile($elem)($parentScope);
@ -44,10 +45,10 @@ define(function (require) {
describe('docViewer', function () {
var $elem;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
$elem = angular.element('<doc-viewer index-pattern="indexPattern" hit="hit" filter="filter"></doc-viewer>');
inject(function (Private) {
ngMock.inject(function (Private) {
indexPattern = Private(require('fixtures/stubbed_logstash_index_pattern'));
flattened = indexPattern.flattenHit(hit);
});

5
src/ui/factories/__tests__/base_object.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('sinon');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/private');
@ -10,9 +11,9 @@ define(function (require) {
var $rootScope;
var BaseObject;
beforeEach(function () {
module('kibana');
ngMock.module('kibana');
inject(function (_$rootScope_, Private) {
ngMock.inject(function (_$rootScope_, Private) {
$rootScope = _$rootScope_;
BaseObject = require('utils/BaseObject');
});

5
src/ui/factories/__tests__/events.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
require('ui/private');
describe('Events', function () {
@ -14,9 +15,9 @@ define(function (require) {
var Promise;
beforeEach(function () {
module('kibana');
ngMock.module('kibana');
inject(function ($injector, Private) {
ngMock.inject(function ($injector, Private) {
$rootScope = $injector.get('$rootScope');
Notifier = $injector.get('Notifier');
Promise = $injector.get('Promise');

5
src/ui/fancy_forms/__tests__/fancy_forms.js
View file

@ -1,5 +1,6 @@
define(function (require) {
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
describe('fancy forms', function () {
@ -16,8 +17,8 @@ define(function (require) {
);
}
beforeEach(module('kibana'));
beforeEach(inject(function ($injector) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($injector) {
$rootScope = $injector.get('$rootScope');
$compile = $injector.get('$compile');

5
src/ui/field_editor/__tests__/field_editor.js
View file

@ -1,6 +1,7 @@
define(function (require) {
describe('FieldEditor directive', function () {
var $ = require('jquery');
var ngMock = require('ngMock');
var expect = require('expect.js');
var Field;
@ -11,8 +12,8 @@ define(function (require) {
var $scope;
var $el;
beforeEach(module('kibana'));
beforeEach(inject(function ($compile, $injector, Private) {
beforeEach(ngMock.module('kibana'));
beforeEach(ngMock.inject(function ($compile, $injector, Private) {
$rootScope = $injector.get('$rootScope');
Field = Private(require('ui/index_patterns/_field'));
StringFormat = Private(require('registry/field_formats')).getType('string');

9
src/ui/filter_bar/__tests__/_addFilters.js
View file

@ -3,6 +3,7 @@ define(function (require) {
var _ = require('lodash');
var sinon = require('auto-release-sinon/mocha');
var expect = require('expect.js');
var ngMock = require('ngMock');
var MockState = require('fixtures/mock_state');
var storeNames = {
app: 'appState',
@ -12,7 +13,7 @@ define(function (require) {
var queryFilter;
var $rootScope, appState, globalState;
beforeEach(module('kibana'));
beforeEach(ngMock.module('kibana'));
beforeEach(function () {
appState = new MockState({ filters: [] });
@ -35,11 +36,11 @@ define(function (require) {
});
beforeEach(function () {
module('kibana/courier', function ($provide) {
ngMock.module('kibana/courier', function ($provide) {
$provide.service('courier', require('fixtures/mock_courier'));
});
module('kibana/global_state', function ($provide) {
ngMock.module('kibana/global_state', function ($provide) {
$provide.service('getAppState', function () {
return function () {
return appState;
@ -53,7 +54,7 @@ define(function (require) {
});
beforeEach(function () {
inject(function (_$rootScope_, Private) {
ngMock.inject(function (_$rootScope_, Private) {
$rootScope = _$rootScope_;
queryFilter = Private(require('ui/filter_bar/query_filter'));
});

Some files were not shown because too many files have changed in this diff Show more