@@ -31,11 +31,10 @@ const backslash = /\\/g;
31
31
32
32
console . error ( 'load test-module-loading.js' ) ;
33
33
34
- // assert that this is the main module.
35
- assert . strictEqual ( require . main . id , '.' , 'main module should have id of \'.\'' ) ;
36
- assert . strictEqual ( require . main , module , 'require.main should === module' ) ;
37
- assert . strictEqual ( process . mainModule , module ,
38
- 'process.mainModule should === module' ) ;
34
+ assert . strictEqual ( require . main . id , '.' ) ;
35
+ assert . strictEqual ( require . main , module ) ;
36
+ assert . strictEqual ( process . mainModule , module ) ;
37
+
39
38
// assert that it's *not* the main module in the required module.
40
39
require ( '../fixtures/not-main-module.js' ) ;
41
40
@@ -102,12 +101,9 @@ const d2 = require('../fixtures/b/d');
102
101
assert . notStrictEqual ( threeFolder , three ) ;
103
102
}
104
103
105
- assert . strictEqual ( require ( '../fixtures/packages/index' ) . ok , 'ok' ,
106
- 'Failed loading package' ) ;
107
- assert . strictEqual ( require ( '../fixtures/packages/main' ) . ok , 'ok' ,
108
- 'Failed loading package' ) ;
109
- assert . strictEqual ( require ( '../fixtures/packages/main-index' ) . ok , 'ok' ,
110
- 'Failed loading package with index.js in main subdir' ) ;
104
+ assert . strictEqual ( require ( '../fixtures/packages/index' ) . ok , 'ok' ) ;
105
+ assert . strictEqual ( require ( '../fixtures/packages/main' ) . ok , 'ok' ) ;
106
+ assert . strictEqual ( require ( '../fixtures/packages/main-index' ) . ok , 'ok' ) ;
111
107
112
108
{
113
109
console . error ( 'test cycles containing a .. path' ) ;
@@ -165,8 +161,7 @@ require.extensions['.test'] = function(module) {
165
161
166
162
assert . strictEqual ( require ( '../fixtures/registerExt2' ) . custom , 'passed' ) ;
167
163
168
- assert . strictEqual ( require ( '../fixtures/foo' ) . foo , 'ok' ,
169
- 'require module with no extension' ) ;
164
+ assert . strictEqual ( require ( '../fixtures/foo' ) . foo , 'ok' ) ;
170
165
171
166
// Should not attempt to load a directory
172
167
try {
@@ -181,13 +176,12 @@ try {
181
176
console . error ( 'load order' ) ;
182
177
183
178
const loadOrder = '../fixtures/module-load-order/' ;
184
- const msg = 'Load order incorrect.' ;
185
179
186
180
require . extensions [ '.reg' ] = require . extensions [ '.js' ] ;
187
181
require . extensions [ '.reg2' ] = require . extensions [ '.js' ] ;
188
182
189
- assert . strictEqual ( require ( `${ loadOrder } file1` ) . file1 , 'file1' , msg ) ;
190
- assert . strictEqual ( require ( `${ loadOrder } file2` ) . file2 , 'file2.js' , msg ) ;
183
+ assert . strictEqual ( require ( `${ loadOrder } file1` ) . file1 , 'file1' ) ;
184
+ assert . strictEqual ( require ( `${ loadOrder } file2` ) . file2 , 'file2.js' ) ;
191
185
try {
192
186
require ( `${ loadOrder } file3` ) ;
193
187
} catch ( e ) {
@@ -197,9 +191,10 @@ try {
197
191
else
198
192
assert . ok ( / f i l e 3 \. n o d e / . test ( e . message . replace ( backslash , '/' ) ) ) ;
199
193
}
200
- assert . strictEqual ( require ( `${ loadOrder } file4` ) . file4 , 'file4.reg' , msg ) ;
201
- assert . strictEqual ( require ( `${ loadOrder } file5` ) . file5 , 'file5.reg2' , msg ) ;
202
- assert . strictEqual ( require ( `${ loadOrder } file6` ) . file6 , 'file6/index.js' , msg ) ;
194
+
195
+ assert . strictEqual ( require ( `${ loadOrder } file4` ) . file4 , 'file4.reg' ) ;
196
+ assert . strictEqual ( require ( `${ loadOrder } file5` ) . file5 , 'file5.reg2' ) ;
197
+ assert . strictEqual ( require ( `${ loadOrder } file6` ) . file6 , 'file6/index.js' ) ;
203
198
try {
204
199
require ( `${ loadOrder } file7` ) ;
205
200
} catch ( e ) {
@@ -208,10 +203,9 @@ try {
208
203
else
209
204
assert . ok ( / f i l e 7 \/ i n d e x \. n o d e / . test ( e . message . replace ( backslash , '/' ) ) ) ;
210
205
}
211
- assert . strictEqual ( require ( `${ loadOrder } file8` ) . file8 , 'file8/index.reg' ,
212
- msg ) ;
213
- assert . strictEqual ( require ( `${ loadOrder } file9` ) . file9 , 'file9/index.reg2' ,
214
- msg ) ;
206
+
207
+ assert . strictEqual ( require ( `${ loadOrder } file8` ) . file8 , 'file8/index.reg' ) ;
208
+ assert . strictEqual ( require ( `${ loadOrder } file9` ) . file9 , 'file9/index.reg2' ) ;
215
209
}
216
210
217
211
{
0 commit comments