Skip to content

Commit 1de6e05

Browse files
committed
dependents#65 - Amd Resolver test passing with aternative fs.
1 parent c7f7a62 commit 1de6e05

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"enhanced-resolve": "^4.1.0",
5353
"is-relative-path": "^1.0.2",
5454
"module-definition": "^3.2.0",
55-
"module-lookup-amd": "^6.1.0",
55+
"module-lookup-amd": "^6.2.0",
5656
"resolve": "^1.10.0",
5757
"resolve-dependency-path": "^2.0.0",
5858
"sass-lookup": "^3.0.0",

test/test.js

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,26 +213,19 @@ describe('filing-cabinet', function() {
213213
const unionfs = require('unionfs');
214214
const memfs = require('memfs');
215215

216-
// mount files specified by "mockedFiles.js.ts" to "app" base directory.
217-
var vol = memfs.Volume.fromJSON(mockedFiles.js.es6, `${volumeDir}`);
216+
// mount files specified by "mockedFiles.js.amd" to "app" base directory.
217+
var vol = memfs.Volume.fromJSON(mockedFiles.js.amd, `${volumeDir}`);
218218
var ufs = unionfs.ufs.use(vol);
219219
const result = cabinet({
220220
partial: './bar',
221221
filename: 'app/foo.js',
222-
directory: 'app',
223-
config: {
224-
baseUrl: './'
225-
}
222+
directory: '',
223+
fileSystem: ufs,
224+
configPath: 'app/config.js'
226225
});
227226

228-
// var result = cabinet({
229-
// partial: './bar',
230-
// configPath: 'amd/config.js',
231-
// filename: 'amd/foo.js',
232-
// fileSystem: ufs
233-
// });
234-
235-
assert.equal(result, `${path.join(__dirname, 'amd/bar.js')}`);
227+
var expected = path.normalize('app/bar.js');
228+
assert.equal(result, expected);
236229

237230
});
238231

0 commit comments

Comments
 (0)