Refactor watch-, sourceMap- and hmr-tests

jhnns · jhnns · commit 7ee7850e4765 · 2015-08-05T15:55:30.000+02:00
diff --git a/test/hmr/entry.js b/test/hmr/entry.js
@@ -1,8 +1,8 @@
 'use strict';
 
-//require('../scss/language.scss');
+require('../scss/language.scss');
 require('./simple.css');
 
 setInterval(function () {
-    document.body.innerHTML += '<br>this text should not suddenly disappear because the style is replaced on-the-fly';
+    document.body.innerHTML += '<br>Now we just change the DOM, so that we can ensure that webpack is not just reloading the page';
 }, 2000);
diff --git a/test/hmr/index.html b/test/hmr/index.html
@@ -6,6 +6,6 @@
     <script async src="/bundle.hmr.js"></script>
 </head>
 <body>
-    <h1 class="another-module box">Now go change some files, dude!</h1>
+    <h1 class="another-scss-module box">Now go change some files, dude!</h1>
 </body>
 </html>
diff --git a/test/hmr/webpack.config.js b/test/hmr/webpack.config.js
@@ -24,7 +24,6 @@ module.exports = {
         ]
     },
     debug: true,
-    devtool: 'eval',
     watch: true,
     plugins: [
         new webpack.HotModuleReplacementPlugin()
diff --git a/test/sourceMap/index.html b/test/sourceMap/index.html
@@ -6,6 +6,6 @@
     <link href="/styles.sourcemap.css" type="text/css" rel="stylesheet">
 </head>
 <body>
-    <h1 class="another-module box">Open the developer tools, dude!</h1>
+    <h1 class="another-scss-module box">Open the developer tools, dude!</h1>
 </body>
 </html>
diff --git a/test/watch/entry.js b/test/watch/entry.js
@@ -0,0 +1,3 @@
+'use strict';
+
+require('../scss/imports.scss');
diff --git a/test/watch/webpack.config.js b/test/watch/webpack.config.js
@@ -5,7 +5,10 @@ var path = require('path');
 var pathToSassLoader = path.resolve(__dirname, '../../index.js');
 
 module.exports = {
-    entry: path.resolve(__dirname, '../sourceMap/entry.js'),
+    entry: [
+        path.resolve(__dirname, '../scss/imports.scss'),
+        path.resolve(__dirname, '../scss/import-include-paths.scss')
+    ],
     output: {
         path: path.resolve(__dirname, '../output'),
         filename: 'bundle.watch.js'
@@ -15,7 +18,7 @@ module.exports = {
         loaders: [
             {
                 test: /\.scss$/,
-                loader: 'css-loader!' + pathToSassLoader
+                loader: 'css-loader!' + pathToSassLoader + '?includePaths[]=' + encodeURIComponent(path.resolve(__dirname, '../scss/from-include-path'))
             }
         ]
     }

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@ module.exports = {`
`24`	`24`	`]`
`25`	`25`	`},`
`26`	`26`	`debug: true,`
`27`		`- devtool: 'eval',`
`28`	`27`	`watch: true,`
`29`	`28`	`plugins: [`
`30`	`29`	`new webpack.HotModuleReplacementPlugin()`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+'use strict';`
	`2`	`+`
	`3`	`+require('../scss/imports.scss');`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,10 @@ var path = require('path');`
`5`	`5`	`var pathToSassLoader = path.resolve(__dirname, '../../index.js');`
`6`	`6`
`7`	`7`	`module.exports = {`
`8`		`- entry: path.resolve(__dirname, '../sourceMap/entry.js'),`
	`8`	`+ entry: [`
	`9`	`+ path.resolve(__dirname, '../scss/imports.scss'),`
	`10`	`+ path.resolve(__dirname, '../scss/import-include-paths.scss')`
	`11`	`+ ],`
`9`	`12`	`output: {`
`10`	`13`	`path: path.resolve(__dirname, '../output'),`
`11`	`14`	`filename: 'bundle.watch.js'`
`@@ -15,7 +18,7 @@ module.exports = {`
`15`	`18`	`loaders: [`
`16`	`19`	`{`
`17`	`20`	`test: /\.scss$/,`
`18`		`- loader: 'css-loader!' + pathToSassLoader`
	`21`	`+ loader: 'css-loader!' + pathToSassLoader + '?includePaths[]=' + encodeURIComponent(path.resolve(__dirname, '../scss/from-include-path'))`
`19`	`22`	`}`
`20`	`23`	`]`
`21`	`24`	`}`