Skip to content

armgit / mocha

Public Imported from GitHub
0

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

tidy commits

Craig Taub98f1cc4b9631
diff --git a/test/integration/helpers.js b/test/integration/helpers.js
index 2870dd43..ea8182b2 100644
--- a/test/integration/helpers.js
+++ b/test/integration/helpers.js
@@ -72,22 +72,6 @@ module.exports = {
},
runMochaJSONRaw: function(fixturePath, args, fn) {
var path;
-<<<<<<< HEAD
-=======
-
- path = resolveFixturePath(fixturePath);
- args = args || [];
-
- return invokeSubMocha(args.concat(['--reporter', 'json', path]), function(
- err,
- resRaw
- ) {
- if (err) return fn(err);
-
- fn(null, resRaw);
- });
- },
->>>>>>> 38bfa4e... use invoker
path = resolveFixturePath(fixturePath);
args = args || [];
@@ -126,11 +110,6 @@ module.exports = {
*/
invokeMocha: invokeMocha,
- /**
- * Same as above except mocha child process spawned is blocked on stdout stream
- */
- invokeBlockingMocha: invokeBlockingMocha,
-
/**
* Resolves the path to a fixture to the full path.
*/
diff --git a/test/integration/options.spec.js b/test/integration/options.spec.js
index ef2a33bf..bb568ca7 100644
--- a/test/integration/options.spec.js
+++ b/test/integration/options.spec.js
@@ -505,7 +505,7 @@ describe('options', function() {
});
});
- describe.only('--watch', function() {
+ describe('--watch', function() {
describe('with watch enabled', function() {
it('should return correct output when watch process is terminated', function(done) {
// After the process ends, this callback is ran