Skip to content

armgit / mocha

Public Imported from GitHub
0

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

fix timeout/slow string values and duplicate arguments

Christopher Hiller8f2a35d8975d
diff --git a/lib/cli/run-option-metadata.js b/lib/cli/run-option-metadata.js
index e10e008f..f19bd577 100644
--- a/lib/cli/run-option-metadata.js
+++ b/lib/cli/run-option-metadata.js
@@ -44,8 +44,8 @@ exports.types = {
'sort',
'watch'
],
- number: ['retries', 'slow', 'timeout'],
- string: ['fgrep', 'grep', 'package', 'reporter', 'ui']
+ number: ['retries'],
+ string: ['fgrep', 'grep', 'package', 'reporter', 'ui', 'slow', 'timeout']
};
/**
diff --git a/lib/cli/run.js b/lib/cli/run.js
index da5ffd7b..0541ec6a 100644
--- a/lib/cli/run.js
+++ b/lib/cli/run.js
@@ -258,6 +258,13 @@ exports.builder = yargs =>
}
});
+ types.boolean
+ .concat(types.string, types.number)
+ .filter(opt => Array.isArray(argv[opt]))
+ .forEach(opt => {
+ argv[opt] = argv[opt].pop();
+ });
+
// yargs.implies() isn't flexible enough to handle this
if (argv.invert && !('fgrep' in argv || 'grep' in argv)) {
throw createMissingArgumentError(
diff --git a/test/integration/duplicate-arguments.spec.js b/test/integration/duplicate-arguments.spec.js
new file mode 100644
index 00000000..28fd225d
--- /dev/null
+++ b/test/integration/duplicate-arguments.spec.js
@@ -0,0 +1,36 @@
+'use strict';
+
+var runMocha = require('./helpers').runMocha;
+
+describe('when non-array argument is provided multiple times', function() {
+ describe('when the same argument name is used', function() {
+ it('should prefer the last value', function(done) {
+ runMocha(
+ 'passing-sync',
+ ['--no-async-only', '--async-only', '--no-async-only'],
+ function(err, result) {
+ if (err) {
+ return done(err);
+ }
+ expect(result, 'to have passed');
+ done();
+ }
+ );
+ });
+ });
+
+ describe('when a different argument name is used', function() {
+ it('should prefer the last value', function(done) {
+ runMocha('passing-async', ['--timeout', '100', '-t', '10'], function(
+ err,
+ result
+ ) {
+ if (err) {
+ return done(err);
+ }
+ expect(result, 'to have failed');
+ done();
+ });
+ });
+ });
+});
diff --git a/test/integration/fixtures/options/slow-test.fixture.js b/test/integration/fixtures/options/slow-test.fixture.js
new file mode 100644
index 00000000..f15cb6d9
--- /dev/null
+++ b/test/integration/fixtures/options/slow-test.fixture.js
@@ -0,0 +1,11 @@
+'use strict';
+
+describe('a suite', function() {
+ it('should succeed in 500ms', function(done) {
+ setTimeout(done, 500);
+ });
+
+ it('should succeed in 1.5s', function(done) {
+ setTimeout(done, 1500);
+ });
+});
diff --git a/test/integration/fixtures/passing-async.fixture.js b/test/integration/fixtures/passing-async.fixture.js
new file mode 100644
index 00000000..24db0b98
--- /dev/null
+++ b/test/integration/fixtures/passing-async.fixture.js
@@ -0,0 +1,7 @@
+'use strict';
+
+describe('a suite', function() {
+ it('should succeed in 50ms', function(done) {
+ setTimeout(done, 50);
+ });
+});
diff --git a/test/integration/fixtures/passing-sync.fixture.js b/test/integration/fixtures/passing-sync.fixture.js
new file mode 100644
index 00000000..6087ebcb
--- /dev/null
+++ b/test/integration/fixtures/passing-sync.fixture.js
@@ -0,0 +1,6 @@
+'use strict';
+
+describe('a suite', function() {
+ it('should succeed', function() {
+ });
+});
diff --git a/test/integration/invalid-arguments.spec.js b/test/integration/invalid-arguments.spec.js
index 6c147bdb..e1eabf20 100644
--- a/test/integration/invalid-arguments.spec.js
+++ b/test/integration/invalid-arguments.spec.js
@@ -3,18 +3,20 @@
var invokeMocha = require('./helpers').invokeMocha;
describe('invalid arguments', function() {
- it('should exit with failure if arguments are invalid', function(done) {
- invokeMocha(
- ['--ui'],
- function(err, result) {
- if (err) {
- return done(err);
- }
- expect(result, 'to have failed');
- expect(result.output, 'to match', /not enough arguments/i);
- done();
- },
- {stdio: 'pipe'}
- );
+ describe('when argument is missing required value', function() {
+ it('should exit with failure', function(done) {
+ invokeMocha(
+ ['--ui'],
+ function(err, result) {
+ if (err) {
+ return done(err);
+ }
+ expect(result, 'to have failed');
+ expect(result.output, 'to match', /not enough arguments/i);
+ done();
+ },
+ {stdio: 'pipe'}
+ );
+ });
});
});
diff --git a/test/integration/options/timeout.spec.js b/test/integration/options/timeout.spec.js
new file mode 100644
index 00000000..ac786da5
--- /dev/null
+++ b/test/integration/options/timeout.spec.js
@@ -0,0 +1,52 @@
+'use strict';
+
+var helpers = require('../helpers');
+var runMochaJSON = helpers.runMochaJSON;
+
+describe('--timeout', function() {
+ it('should allow human-readable string value', function(done) {
+ runMochaJSON('options/slow-test', ['--timeout', '1s'], function(err, res) {
+ if (err) {
+ done(err);
+ return;
+ }
+ expect(res, 'to have failed')
+ .and('to have passed test count', 1)
+ .and('to have failed test count', 1);
+ done();
+ });
+ });
+
+ it('should allow numeric value', function(done) {
+ runMochaJSON('options/slow-test', ['--timeout', '1000'], function(
+ err,
+ res
+ ) {
+ if (err) {
+ done(err);
+ return;
+ }
+ expect(res, 'to have failed')
+ .and('to have passed test count', 1)
+ .and('to have failed test count', 1);
+ done();
+ });
+ });
+
+ it('should allow multiple values', function(done) {
+ var fixture = 'options/slow-test';
+ runMochaJSON(fixture, ['--timeout', '2s', '--timeout', '1000'], function(
+ err,
+ res
+ ) {
+ if (err) {
+ done(err);
+ return;
+ }
+ expect(res, 'to have failed')
+ .and('to have passed test count', 1)
+ .and('to have failed test count', 1);
+ done();
+ });
+ });
+});
diff --git a/test/node-unit/cli/options.spec.js b/test/node-unit/cli/options.spec.js
index 62a63f9f..2e1e4aa0 100644
--- a/test/node-unit/cli/options.spec.js
+++ b/test/node-unit/cli/options.spec.js
@@ -629,7 +629,7 @@ describe('options', function() {
findupSync
});
- expect(loadOptions(), 'to satisfy', {timeout: 800, require: ['foo']});
+ expect(loadOptions(), 'to satisfy', {timeout: '800', require: ['foo']});
});
it('should prioritize package.json over mocha.opts', function() {
@@ -692,7 +692,7 @@ describe('options', function() {
loadOptions('--timeout 500'),
'to have property',
'timeout',
- 500
+ '500'
);
});
});