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

Merge pull request #5024 from BigFunger/unit-test-windows-fix

Browse source 
[unit tests] Fixes generated paths to support windows
This commit is contained in:
Spencer 2015-09-23 13:25:19 -07:00
parent 0b06d1a211 ae0f624b2d
commit 8147ed9e97
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/testsBundle/testsEntryTemplate.js
View file

@ -5,7 +5,7 @@ module.exports = function ({env, bundle}) {
.join('\n');
let requires = bundle.modules
.map(m => `require('${m}');`)
.map(m => `require(${JSON.stringify(m)});`)
.join('\n');
return `

7
tasks/config/run.js
View file

@ -2,6 +2,7 @@ module.exports = function (grunt) {
let platform = require('os').platform();
let {resolve} = require('path');
let root = p => resolve(__dirname, '../../', p);
let binScript = /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana';
return {
testServer: {
@ -11,7 +12,7 @@ module.exports = function (grunt) {
quiet: false,
failOnError: false
},
cmd: /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana',
cmd: binScript,
args: [
'--server.port=5610',
'--env.name=development',
@ -28,7 +29,7 @@ module.exports = function (grunt) {
quiet: false,
failOnError: false
},
cmd: /^win/.test(platform) ? '.\\bin\\kibana.bat' : './bin/kibana',
cmd: binScript,
args: [
'--server.port=5610',
'--env.name=development',
@ -46,7 +47,7 @@ module.exports = function (grunt) {
quiet: false,
failOnError: false
},
cmd: './bin/kibana',
cmd: binScript,
args: [
'--dev',
'--no-watch',