github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

Added angular-mocks

Browse source
This commit is contained in:
Rashid Khan 2014-03-04 10:04:47 -07:00
parent a6d7a2a092
commit 1ea7a93cad
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/kibana/require.config.js
View file

@ -4,6 +4,7 @@ require.config({
kibana: './index',
courier: '../courier',
angular: '../bower_components/angular/angular',
'angular-mocks': '../bower_components/angular-mocks/angular-mocks',
'angular-route': '../bower_components/angular-route/angular-route',
async: '../bower_components/async/lib/async',
css: '../bower_components/require-css/css',
@ -13,7 +14,8 @@ require.config({
jquery: '../bower_components/jquery/dist/jquery',
lodash: '../bower_components/lodash/dist/lodash',
moment: '../bower_components/moment/moment',
gridster: '../bower_components/gridster/dist/jquery.gridster'
gridster: '../bower_components/gridster/dist/jquery.gridster',
config: '../config'
},
shim: {
angular: {
@ -26,6 +28,9 @@ require.config({
'angular-route': {
deps: ['angular']
},
'angular-mocks': {
deps: ['angular']
},
'elasticsearch': {
deps: ['angular']
}

3
test/.jshintrc
View file

@ -4,6 +4,9 @@
"white": false,
"globals": {
"module": false,
"inject": false,
"console": false,
"describe": true,
"it": true,
"beforeEach": true,

2
test/unit/index.html
View file

@ -14,7 +14,7 @@
}
}
});
require(["/fixtures/field_mapping.js","/specs/calculate_indices.js","/specs/courier.js","/specs/data_source.js","/specs/mapper.js"], function () {
require(["/fixtures/field_mapping.js","/specs/apps/dashboard/index.js","/specs/apps/dashboard/mocks/modules.js","/specs/calculate_indices.js","/specs/courier.js","/specs/data_source.js","/specs/mapper.js"], function () {
window.mochaRunner = mocha.run().on('end', function () {
window.mochaResults = this.stats;
});