From 893c723bc7ae2cf8a863d15dc505e2b6745eeb16 Mon Sep 17 00:00:00 2001 From: Matt Bierner Date: Thu, 9 Jun 2016 16:55:42 -0700 Subject: [PATCH] Improve mocha.json user messaging Small changes to improve messaging around mocha.json as suggested by #499. closes #499 --- Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js b/Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js index 886948d54..90917ce5b 100644 --- a/Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js +++ b/Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js @@ -1,4 +1,5 @@ -var fs = require('fs'); +"use strict"; +var fs = require('fs'); var path = require('path'); // Choose 'tap' rather than 'min' or 'xunit'. The reason is that @@ -125,13 +126,13 @@ function getMochaOptions(projectFolder) { var mochaOptions = defaultMochaOptions; try { var optionsPath = path.join(projectFolder, 'test', 'mocha.json'); - var options = require(optionsPath); - options = options || {}; + var options = require(optionsPath) || {}; for (var opt in options) { mochaOptions[opt] = options[opt]; } + console.log("Found mocha.json file. Using Mocha settings: ", mochaOptions); } catch (ex) { - console.log("mocha.json options file not found. Using default values:", mochaOptions); + console.log("Using default Mocha settings"); } // set timeout to 10 minutes, because the default of 2 sec is too short for debugging scenarios