Fix folder name inconsistency

webpack-contrib · Feb 14, 2017 · e939cac · e939cac
1 parent 5fe4030
commit e939cac
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/test/bootstrapSass/webpack.config.js b/test/bootstrapSass/webpack.config.js
@@ -21,7 +21,7 @@ module.exports = {
                 loader: sassLoader,
                 options: {
                     includePaths: [
-                        path.resolve(__dirname, "../scss/from-include-path")
+                        path.resolve(__dirname, "../scss/includePath")
                     ]
                 }
             }]

diff --git a/test/index.test.js b/test/index.test.js
@@ -60,7 +60,7 @@ syntaxStyles.forEach(ext => {
             it("should resolve imports from other language style correctly", () => execTest("import-other-style"));
             // Test for includePath imports
             it("should resolve imports from another directory declared by includePaths correctly", () => execTest("import-include-paths", {
-                includePaths: [path.join(__dirname, ext, "from-include-path")]
+                includePaths: [path.join(__dirname, ext, "includePath")]
             }));
             it("should not resolve CSS imports", () => execTest("import-css"));
             it("should compile bootstrap-sass without errors", () => execTest("bootstrap-sass"));

diff --git a/...path/_underscore-include-path-module.sass → ...Path/_underscore-include-path-module.sass b/...path/_underscore-include-path-module.sass → ...Path/_underscore-include-path-module.sass
diff --git a/...from-include-path/animate.css/animate.css → .../sass/includePath/animate.css/animate.css b/...from-include-path/animate.css/animate.css → .../sass/includePath/animate.css/animate.css
diff --git a/...rom-include-path/include-path-module.sass → ...sass/includePath/include-path-module.sass b/...rom-include-path/include-path-module.sass → ...sass/includePath/include-path-module.sass
diff --git a/...path/_underscore-include-path-module.scss → ...Path/_underscore-include-path-module.scss b/...path/_underscore-include-path-module.scss → ...Path/_underscore-include-path-module.scss
diff --git a/...from-include-path/animate.css/animate.css → .../scss/includePath/animate.css/animate.css b/...from-include-path/animate.css/animate.css → .../scss/includePath/animate.css/animate.css
diff --git a/...rom-include-path/include-path-module.scss → ...scss/includePath/include-path-module.scss b/...rom-include-path/include-path-module.scss → ...scss/includePath/include-path-module.scss
diff --git a/test/tools/createSpec.js b/test/tools/createSpec.js
@@ -39,7 +39,7 @@ function createSpec(ext) {
                 functions: customFunctions,
                 includePaths: [
                     path.join(testFolder, ext, "another"),
-                    path.join(testFolder, ext, "from-include-path")
+                    path.join(testFolder, ext, "includePath")
                 ]
             };
 

diff --git a/test/watch/webpack.config.js b/test/watch/webpack.config.js
@@ -24,7 +24,7 @@ module.exports = {
                 loader: sassLoader,
                 options: {
                     includePaths: [
-                        path.resolve(__dirname, "../scss/from-include-path")
+                        path.resolve(__dirname, "../scss/includePath")
                     ]
                 }
             }]