@@ -31,11 +31,10 @@ const backslash = /\\/g;
3131
3232console . error ( 'load test-module-loading.js' ) ;
3333
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+
3938// assert that it's *not* the main module in the required module.
4039require ( '../fixtures/not-main-module.js' ) ;
4140
@@ -102,12 +101,9 @@ const d2 = require('../fixtures/b/d');
102101 assert . notStrictEqual ( threeFolder , three ) ;
103102}
104103
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' ) ;
111107
112108{
113109 console . error ( 'test cycles containing a .. path' ) ;
@@ -165,8 +161,7 @@ require.extensions['.test'] = function(module) {
165161
166162assert . strictEqual ( require ( '../fixtures/registerExt2' ) . custom , 'passed' ) ;
167163
168- assert . strictEqual ( require ( '../fixtures/foo' ) . foo , 'ok' ,
169- 'require module with no extension' ) ;
164+ assert . strictEqual ( require ( '../fixtures/foo' ) . foo , 'ok' ) ;
170165
171166// Should not attempt to load a directory
172167try {
@@ -181,13 +176,12 @@ try {
181176 console . error ( 'load order' ) ;
182177
183178 const loadOrder = '../fixtures/module-load-order/' ;
184- const msg = 'Load order incorrect.' ;
185179
186180 require . extensions [ '.reg' ] = require . extensions [ '.js' ] ;
187181 require . extensions [ '.reg2' ] = require . extensions [ '.js' ] ;
188182
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' ) ;
191185 try {
192186 require ( `${ loadOrder } file3` ) ;
193187 } catch ( e ) {
@@ -197,9 +191,10 @@ try {
197191 else
198192 assert . ok ( / f i l e 3 \. n o d e / . test ( e . message . replace ( backslash , '/' ) ) ) ;
199193 }
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' ) ;
203198 try {
204199 require ( `${ loadOrder } file7` ) ;
205200 } catch ( e ) {
@@ -208,10 +203,9 @@ try {
208203 else
209204 assert . ok ( / f i l e 7 \/ i n d e x \. n o d e / . test ( e . message . replace ( backslash , '/' ) ) ) ;
210205 }
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' ) ;
215209}
216210
217211{
0 commit comments