[functional testing] Cleanup, run from npm test

This commit is contained in:
Jonathan Budzenski 2015-09-09 10:12:45 -05:00
parent e67b961658
commit d6c9019be5
3 changed files with 14 additions and 7 deletions

View file

@ -18,8 +18,14 @@ module.exports = function (grunt) {
files.forEach(function (file) {
fs.createReadStream(path.join(FIXTURES_PATH, file))
.pipe(request.post(`${config.server}/_bulk`, function (err, res, body) {
if (err || res.statusCode !== 200) grunt.fail.warn(err || body);
grunt.log.writeln(`[${colors.green('success')}] ${file}`);
var status;
if (err || res.statusCode !== 200) {
grunt.fail.warn(err || body);
status = colors.red('error');
} else {
status = colors.green('success');
}
grunt.log.writeln(`[${status}] ${file}`);
if (++doneProcessing === files.length) done();
}));
});

View file

@ -22,7 +22,7 @@ module.exports = function (grunt) {
const SELENIUM_DOWNLOAD_URL = config.seleniumStandalone.server + config.seleniumStandalone.filename;
const SELENIUM_HASH = config.seleniumStandalone.md5;
function waitForReadiness(seleniumProcess, ready) {
function waitForReadiness(seleniumProcess) {
seleniumProcess.stderr.on('data', function (log) {
if (~log.toString('utf8').indexOf('Selenium Server is up and running')) {
grunt.log.writeln('Selenium standalone started on port 4444');
@ -30,9 +30,6 @@ module.exports = function (grunt) {
}
});
process.on('exit', function () {
seleniumProcess.kill();
});
}
function validateDownload(path, expectedHash, success) {
@ -48,6 +45,9 @@ module.exports = function (grunt) {
function spawnSelenium() {
var seleniumProcess = spawn('java', ['-jar', SELENIUM_FILE_PATH]);
process.on('exit', function () {
seleniumProcess.kill();
});
waitForReadiness(seleniumProcess);
}
@ -67,7 +67,7 @@ module.exports = function (grunt) {
function start() {
fs.mkdir(SELENIUM_DIRECTORY, function (err) {
if (err && err.code !== 'EEXIST') grunt.fail.warn(err);
if (err && err.code !== 'EEXIST') return grunt.fail.warn(err);
fs.exists(SELENIUM_FILE_PATH, function (exists) {
if (exists) {
spawnSelenium();

View file

@ -6,6 +6,7 @@ module.exports = function (grunt) {
grunt.registerTask('test:quick', [
'test:server',
'test:ui',
'test:browser'
]);