Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

Tidies up code after review

Harry Sarson8df5727478a1
diff --git a/lib/reporters/base.js b/lib/reporters/base.js
index b552e097..aba25d04 100644
--- a/lib/reporters/base.js
+++ b/lib/reporters/base.js
@@ -172,17 +172,14 @@ function stringifyDiffObjs (err) {
* The diff will be either inline or unified dependant on the value
* of `Base.inlineDiff`.
*
- * @api private
- * @param {String} actual
- * @param {String} expected
+ * @param {string} actual
+ * @param {string} expected
* @return {string} Diff
*/
var generateDiff = exports.generateDiff = function (actual, expected) {
- if (exports.inlineDiffs) {
- return inlineDiff(actual, expected);
- } else {
- return unifiedDiff(actual, expected);
- }
+ return exports.inlineDiffs
+ ? inlineDiff(actual, expected)
+ : unifiedDiff(actual, expected);
};
/**
diff --git a/test/reporters/base.spec.js b/test/reporters/base.spec.js
index 3cee5dd7..0225d792 100644
--- a/test/reporters/base.spec.js
+++ b/test/reporters/base.spec.js
@@ -137,17 +137,23 @@ describe('Base reporter', function () {
});
describe('Diff generation', function () {
+ var oldInlineDiffs;
+
+ beforeEach(function () {
+ oldInlineDiffs = Base.inlineDiffs;
+ });
+
+ afterEach(function () {
+ Base.inlineDiffs = oldInlineDiffs;
+ });
+
it('should generate unified diffs if `inlineDiff === false`', function () {
var actual = 'a foo unified diff';
var expected = 'a bar unified diff';
- var oldInlineDiffs = Base.inlineDiffs;
Base.inlineDiffs = false;
-
var output = Base.generateDiff(actual, expected);
- Base.inlineDiffs = oldInlineDiffs;
-
expect(output).to.equal('\n + expected - actual\n\n -a foo unified diff\n +a bar unified diff\n ');
});
@@ -155,13 +161,9 @@ describe('Base reporter', function () {
var actual = 'a foo inline diff';
var expected = 'a bar inline diff';
- var oldInlineDiffs = Base.inlineDiffs;
Base.inlineDiffs = true;
-
var output = Base.generateDiff(actual, expected);
- Base.inlineDiffs = oldInlineDiffs;
-
expect(output).to.equal(' \n actual expected\n \n a foobar inline diff\n ');
});
});