test: Refactor module import tests

In preparation for #573 Imports without file extensions are deprecated in LibSass and even not supported in DartSass.
webpack-contrib · Aug 1, 2018 · 83149e8 · 83149e8
1 parent d0b35cb
commit 83149e8
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/test/index.test.js b/test/index.test.js
@@ -205,7 +205,7 @@ describe("sass-loader", () => {
                     sourceMap.should.not.have.property("file");
                     sourceMap.should.have.property("sourceRoot", fakeCwd);
                     // This number needs to be updated if imports.scss or any dependency of that changes
-                    sourceMap.sources.should.have.length(13);
+                    sourceMap.sources.should.have.length(12);
                     sourceMap.sources.forEach(sourcePath =>
                         fs.existsSync(path.resolve(sourceMap.sourceRoot, sourcePath))
                     );

diff --git a/test/node_modules/another/package.json b/test/node_modules/another/package.json
diff --git a/test/node_modules/module → test/node_modules/module/module.scss b/test/node_modules/module → test/node_modules/module/module.scss
diff --git a/test/node_modules/module/package.json b/test/node_modules/module/package.json
diff --git a/test/node_modules/other-module b/test/node_modules/other-module
diff --git a/test/sass/imports.sass b/test/sass/imports.sass
@@ -18,11 +18,12 @@
 /* scoped import @import language */
 .scoped-imporr
   @import language
+
 // The local util file should take precedence over Node's util module
 // See https://github.com/webpack-contrib/sass-loader/issues/556
 /* @import util */
 @import util
 /* @import ~module */
 @import ~module
-/* @import ~other-module */
-@import ~other-module
+/* @import ~another */
+@import ~another
diff --git a/test/scss/imports.scss b/test/scss/imports.scss
@@ -1,7 +1,5 @@
 /* @import "another/module"; */
 @import "another/module";
-/* @import "~another/module"; */
-@import "~another/module";
 /* @import "another/underscore"; */
 @import "another/underscore";
 /* @import "another/_underscore"; */
@@ -27,5 +25,5 @@
 @import "util";
 /* @import "~module"; */
 @import "~module";
-/* @import "~other-module"; */
-@import "~other-module";
+/* @import "~another"; */
+@import "~another";
diff --git a/test/tools/createSpec.js b/test/tools/createSpec.js
@@ -15,6 +15,8 @@ function createSpec(ext) {
     const testNodeModules = path.relative(basePath, path.join(testFolder, "node_modules")) + path.sep;
     const pathToBootstrap = path.relative(basePath, path.resolve(testFolder, "..", "node_modules", "bootstrap-sass"));
     const pathToScopedNpmPkg = path.relative(basePath, path.resolve(testFolder, "node_modules", "@org", "pkg", "./index.scss"));
+    const pathToModule = path.relative(basePath, path.resolve(testFolder, "node_modules", "module", "module.scss"));
+    const pathToAnother = path.relative(basePath, path.resolve(testFolder, "node_modules", "another", "module.scss"));
     const pathToFooAlias = path.relative(basePath, path.resolve(testFolder, ext, "another", "alias." + ext));
 
     fs.readdirSync(path.join(testFolder, ext))
@@ -33,6 +35,8 @@ function createSpec(ext) {
                         url = url
                             .replace(/^~bootstrap-sass/, pathToBootstrap)
                             .replace(/^~@org\/pkg/, pathToScopedNpmPkg)
+                            .replace(/^~module/, pathToModule)
+                            .replace(/^~another/, pathToAnother)
                             .replace(/^~/, testNodeModules)
                             .replace(/^path-to-alias/, pathToFooAlias);
                     }