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

the screencast reporter no longer interfers with the 'html' reporter

Browse source
This commit is contained in:
Spencer Alger 2014-09-16 23:46:05 -07:00
parent d8beffb170
commit a1e6244d0d
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/kibana/apps/visualize/editor/panels/save.html
View file

@ -1,7 +1,7 @@
<form role="form" ng-submit="conf.doSave()">
<div class="form-group">
<label for="visTitle">Title</label>
<input class="form-control" type="text" name="visTitle" ng-model="conf.savedVis.title" required>
<input class="form-control" input-focus type="text" name="visTitle" ng-model="conf.savedVis.title" required>
</div>
<div class="form-group">
<label for="visDescription">Description</label>

25
test/unit/index.html
View file

@ -4,11 +4,8 @@
<title>Kibana4 Tests</title>
<link rel="stylesheet" href="/node_modules/mocha/mocha.css" />
<link rel="stylesheet" href="/node_modules/mocha-screencast-reporter/screencast-reporter.css" />
<script src="/node_modules/expect.js/index.js"></script>
<script src="/node_modules/mocha/mocha.js"></script>
<script src="/node_modules/mocha-screencast-reporter/screencast-reporter.js"></script>
<script src="/src/kibana/bower_components/requirejs/require.js"></script>
<script src="/src/kibana/require.config.js"></script>
@ -18,7 +15,7 @@
mocha.setup({
ui: 'bdd',
reporter: SAUCELABS ? ScreencastReporter : 'html'
reporter: 'html'
});
require.config({
@ -31,7 +28,9 @@
sinon: '../../test/utils/sinon',
bluebird: 'bower_components/bluebird/js/browser/bluebird',
angular: 'bower_components/angular-mocks/angular-mocks',
angular_src: 'bower_components/angular/angular'
angular_src: 'bower_components/angular/angular',
screencast_reporter_css: '../../node_modules/mocha-screencast-reporter/screencast-reporter',
ScreencastReporter: '../../node_modules/mocha-screencast-reporter/screencast-reporter'
},
shim: {
angular: {
@ -63,6 +62,16 @@
});
}
function setupSaucelabsReporter(done) {
require([
'ScreencastReporter',
'css!screencast_reporter_css'
], function (ScreencastReporter) {
mocha.reporter(ScreencastReporter);
done()
});
}
function runTests() {
require([
'kibana',
@ -172,7 +181,11 @@
if (COVERAGE) {
setupCoverage(runTests);
} else {
}
else if (SAUCELABS) {
setupSaucelabsReporter(runTests);
}
else {
runTests();
}