Skip to content

Commit a49def5

Browse files
authored
Merge pull request #149 from wesleytodd/fix-require-flag
Fix behavior of --require flag
2 parents 770be84 + e779fec commit a49def5

File tree

4 files changed

+19
-6
lines changed

4 files changed

+19
-6
lines changed

lib/mochify.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,11 @@ module.exports = function (_, opts) {
177177
}
178178
if (opts.require) {
179179
[].concat(opts.require).forEach(function (r) {
180-
b.add(resolve.sync(r, {
180+
b.require(resolve.sync(r, {
181181
basedir: process.cwd()
182-
}));
182+
}), {
183+
expose: r
184+
});
183185
});
184186
}
185187

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/*global describe, it*/
2+
'use strict';
3+
4+
describe('test', function () {
5+
6+
it('passes', function () {
7+
return require('../../required');
8+
});
9+
10+
});

test/node-test.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,10 @@ describe('node', function () {
186186
});
187187

188188
it('requires file', function (done) {
189-
run('passes', ['--node', '-R', 'tap', '-r', '../required'],
189+
run('require', ['--node', '-R', 'tap', '-r', '../required'],
190190
function (code, stdout) {
191-
assert.equal(stdout.split('\n')[1], 'required');
191+
var lines = stdout.split('\n');
192+
assert.equal(lines[2], 'required');
192193
assert.equal(code, 0);
193194
done();
194195
});

test/phantom-test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ describe('phantom', function () {
103103
});
104104

105105
it('requires file', function (done) {
106-
run('passes', ['-R', 'tap', '-r', '../required'], function (code, stdout) {
107-
assert.equal(stdout.split('\n')[1], 'required');
106+
run('require', ['-R', 'tap', '-r', '../required'], function (code, stdout) {
107+
assert.equal(stdout.split('\n')[2], 'required');
108108
assert.equal(code, 0);
109109
done();
110110
});

0 commit comments

Comments
 (0)