Merge pull request #299 from Financial-Times/nightwatch-fix

Fixes nightwatch bugs where the configpath was being used before it b…

lib/tasks/build.js

@@ -107,7 +107,6 @@ module.exports.sass = function(gulp, config) {
 		config.env = config.env || 'development';
 		var useSourceMaps = config.sourcemaps === true || config.env === 'development';
 
-		console.log("Current working directory: ", cwd);
 		var sassConfig = {
 			includePaths: [path.join(cwd, 'bower_components')].concat(config.sassIncludePaths || []),
 			outputStyle: config.env === 'production' ? 'compressed' : 'nested'

lib/tasks/test.js

@@ -172,14 +172,21 @@ module.exports.browserTest = function(gulp, config) {
 	var demo = require('./demo');
 
 	config = config || {};
+	config.nightwatchConfig = config.nightwatchConfig || path.resolve('.', 'test/browser/nightwatch.json');
+
 	var appName = files.getModuleName();
 	var token;
 	var commit;
 	var packageJsonContent = fs.readFileSync(path.join(process.cwd(), 'package.json'), 'utf8');
 
 	function cleanupTest(output) {
-		fs.unlink('Procfile');
-		fs.unlink(config.nightwatchConfig.replace('json', 'tmp.json'));
+		try {
+			fs.unlinkSync('Procfile');
+			fs.unlinkSync(config.nightwatchConfig.replace('json', 'tmp.json'));
+		} catch (e) {
+			// Suppress errors
+		}
+
 		fs.writeFileSync(path.join(process.cwd(), 'package.json'), packageJsonContent, 'utf8');
 
 		if (output && output.stdout) {
@@ -230,7 +237,6 @@ module.exports.browserTest = function(gulp, config) {
 		pollHeroku(config.testUrl);
 	})
 	.then(function() {
-		config.nightwatchConfig = config.nightwatchConfig || path.resolve('.', 'test/browser/nightwatch.json');
 		return module.exports._runBrowserTest(config);
 	})
 	.then(function(output) {