github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-24 01:38:56 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of github.com:elastic/kibana into fix/3944

Browse source
This commit is contained in:
Spencer Alger 2015-05-26 13:46:44 -07:00
commit f71f3a1cbb
3 changed files with 29 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tasks/config/copy.js
View file

@ -71,6 +71,12 @@ module.exports = function (grunt) {
cwd: '<%= server %>/config/',
src: 'kibana.yml',
dest: '<%= build %>/dist/kibana/config/'
},
{
expand: true,
cwd: '<%= bowerComponentsDir %>/ace-builds/src-noconflict/',
src: 'worker-json.js',
dest: '<%= build %>/dist/kibana/src/public/'
}
]
},

32
test/unit/index.html
View file

@ -13,21 +13,32 @@
var SAUCELABS = !!(/saucelabs/i.test(window.location.search));
var DISABLE_RESIZE_CHECKER = true;
var mochaSuiteOn = mocha.suite.on;
mocha.suite.on = function (eventName, fn) {
if (eventName !== 'pre-require') {
return mochaSuiteOn.call(this, eventName, fn);
}
return mochaSuiteOn.call(this, eventName, function (context, file, mocha) {
fn.call(this, context, file, mocha);
var contextDescribe = context.describe;
context.describe = function (name, body) {
if (!body && name && name instanceof Array) {
contextDescribe(name[0], name[1]);
} else {
contextDescribe(name, body);
}
};
});
};
mocha.setup({
ui: 'bdd',
reporter: 'html'
});
window.describe = (function (originalDescribe) {
return function (name, body) {
if (!body && name && name instanceof Array) {
originalDescribe(name[0], name[1]);
} else {
originalDescribe(name, body);
}
};
}(window.describe))
require.config({
baseUrl: '/',
paths: {
@ -154,6 +165,7 @@
});
}
if (COVERAGE) {
setupCoverage(runTests);
}

2
test/unit/specs/components/agg_types/index.js
View file

@ -4,7 +4,7 @@ define(function (require) {
describe(require('specs/components/agg_types/_agg_params'));
describe(require('specs/components/agg_types/_bucket_count_between'));
describe(require('specs/components/agg_types/buckets/_histogram'));
describe(require('specs/components/agg_types/buckets/date_histogram/_date_histogram'));
describe(require('specs/components/agg_types/buckets/_date_histogram'));
describe('bucket aggs', function () {
var bucketAggs;