Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions Nodejs/Product/Nodejs/TestFrameworks/mocha/mocha.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
var EOL = require('os').EOL;
"use strict";
var EOL = require('os').EOL;
var fs = require('fs');
var path = require('path');

Expand Down Expand Up @@ -129,13 +130,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
Expand Down