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

load port from the server config

Browse source
This commit is contained in:
Joe Fleming 2015-01-21 12:13:56 -07:00
parent af2bffc8ac
commit 8c227e46ef
4 changed files with 11 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
tasks/config/mocha.js
View file

@ -1,3 +1,6 @@
var config = require('../utils/server-config');
var unitTestUrl = require('util').format('http://localhost:%d/test/unit/', config.kibana.port);
module.exports = {
options: {
log: true,
@ -6,9 +9,7 @@ module.exports = {
},
unit: {
options: {
urls: [
'http://localhost:5601/test/unit/'
]
urls: [ unitTestUrl ]
}
}
};

4
tasks/config/saucelabs-mocha.js
View file

@ -1,3 +1,5 @@
var config = require('../utils/server-config');
var unitTestUrl = require('util').format('http://localhost:%d/test/unit/?saucelabs=true', config.kibana.port);
var buildId = 'test build';
if (process.env.TRAVIS_BUILD_ID) {
buildId = 'travis build #' + process.env.TRAVIS_BUILD_ID;
@ -8,7 +10,7 @@ module.exports = {
options: {
username: 'kibana',
key: process.env.SAUCE_ACCESS_KEY,
urls: ['http://localhost:8000/test/unit/?saucelabs=true'],
urls: [ unitTestUrl ],
testname: 'Kibana Browser Tests',
build: buildId,
concurrency: 10,

2
tasks/maybe_start_kibana.js
View file

@ -1,5 +1,5 @@
module.exports = function (grunt) {
var config = require('../src/server/config');
var config = require('./utils/server-config');
var maybeStartServer = function (options) {
return function () {

4
tasks/run_build.js
View file

@ -1,4 +1,6 @@
var os = require('os');
var config = require('./utils/server-config');
module.exports = function (grunt) {
grunt.registerTask('run_build', [
'build',
@ -25,6 +27,6 @@ module.exports = function (grunt) {
});
grunt.registerTask('_open_built_kibana', function () {
require('opn')('http://localhost:5601');
require('opn')('http://localhost:' + config.kibana.port);
});
};