TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-12-27 12:53:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2987 from ErisDS/casper-concise

Browse Source 
Show concise casper logs in Travis
This commit is contained in:
Hannah Wolfe 2014-06-17 22:45:35 +01:00
commit 772657ff26
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gruntfile.js
View File

@ -609,7 +609,7 @@ var path = require('path'),
options = ['host', 'noPort', 'port', 'email', 'password'],
args = ['test']
.concat(grunt.option('target') || ['admin/', 'frontend/'])
.concat(['--includes=base.js', '--verbose', '--log-level=debug', '--port=2369']);
.concat(['--includes=base.js', '--log-level=debug', '--port=2369']);
// Forward parameters from grunt to casperjs
_.each(options, function processOption(option) {
@ -622,8 +622,11 @@ var path = require('path'),
args.push('--fail-fast');
}
if (grunt.option('concise')) {
// Show concise logs in Travis as ours are getting too long
if (grunt.option('concise') || process.env.TRAVIS) {
args.push('--concise');
} else {
args.push('--verbose');
}
grunt.util.spawn({

6
core/test/functional/admin/login_test.js
View File

@ -20,10 +20,10 @@ CasperTest.begin('Ensure a User is Registered', 2, function suite(test) {
casper.waitForSelectorTextChange('.notification-error', function onSuccess() {
test.assertSelectorHasText('.notification-error', 'already registered');
// If the previous assert succeeds, then we should skip the next check and just pass.
casper.echo('Already registered!');
casper.echoConcise('Already registered!');
}, function onTimeout() {
test.assertUrlMatch(/\/ghost\/$/, 'If we\'re not already registered, we should be logged in.');
casper.echo('Successfully registered.');
casper.echoConcise('Successfully registered.');
}, 2000);
casper.thenOpen(url + 'logout/', function then() {
@ -41,7 +41,7 @@ CasperTest.begin("Ghost admin will load login page", 3, function suite(test) {
return document.querySelector(selector).getAttribute('href');
}, '.forgotten-password');
casper.echo('LINK' + link);
casper.echoConcise('LINK' + link);
test.assert(link === '/ghost/forgotten/', 'Has correct forgotten password link');
});
});

16
core/test/functional/base.js
View File

@ -83,18 +83,24 @@ casper.failOnTimeout = function (test, message) {
};
};
casper.echoConcise = function (message, style) {
if (!casper.cli.options.concise) {
casper.echo(message, style);
}
}
// ## Debugging
// output all errors to the console
casper.on('remote.message', function (msg) {
casper.echo('GOT CONSOLE LOG: ' + msg);
casper.echoConcise('GOT CONSOLE LOG: ' + msg);
});
casper.on('error', function (msg) {
casper.echo('GOT ERROR, ' + msg);
casper.echoConcise('GOT ERROR, ' + msg);
});
casper.on("page.error", function (msg) {
this.echo("GOT PAGE ERROR: " + msg, "ERROR");
casper.echoConcise("GOT PAGE ERROR: " + msg, "ERROR");
});
casper.captureScreenshot = function (filename, debugOnly) {
@ -202,9 +208,9 @@ CasperTest.Routines = (function () {
var errorText = casper.evaluate(function () {
return document.querySelector('.notification-error').innerText;
});
this.echo('It appears as though a user is already registered. Error text: ' + errorText);
casper.echoConcise('It appears as though a user is already registered. Error text: ' + errorText);
}, function onTimeout() {
this.echo('It appears as though a user was not already registered.');
casper.echoConcise('It appears as though a user was not already registered.');
}, 2000);
}