From 1debf35bdfdf20e175d3009ac2a8e08e0d258c5a Mon Sep 17 00:00:00 2001
From: Jan Nicklas <j.nicklas@me.com>
Date: Wed, 11 Mar 2015 11:26:52 +0100
Subject: [PATCH] Adjust tests for hash urls

---
 spec/HtmlWebpackPluginSpec.js | 30 ++++++++++++++++--------------
 spec/fixtures/test.html       |  2 +-
 2 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/spec/HtmlWebpackPluginSpec.js b/spec/HtmlWebpackPluginSpec.js
index e737806..96a2cd0 100644
--- a/spec/HtmlWebpackPluginSpec.js
+++ b/spec/HtmlWebpackPluginSpec.js
@@ -17,7 +17,7 @@ function testHtmlPlugin(webpackConfig, expectedResults, outputFile, done) {
       if (expectedResult instanceof RegExp) {
         expect(htmlContent).toMatch(expectedResult);
       } else {
-        expect(htmlContent).toContain(expectedResult);
+        expect(htmlContent).toContain(expectedResult.replace('%hash%', stats.hash));
       }
     }
     done();
@@ -37,7 +37,7 @@ describe('HtmlWebpackPlugin', function() {
         filename: 'index_bundle.js'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, ['<script src="index_bundle.js"'], null, done);
+    }, ['<script src="index_bundle.js?%hash%"'], null, done);
 
   });
 
@@ -52,7 +52,7 @@ describe('HtmlWebpackPlugin', function() {
         filename: '[name]_bundle.js'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, ['<script src="util_bundle.js"', '<script src="app_bundle.js"'], null, done);
+    }, ['<script src="util_bundle.js?%hash%"', '<script src="app_bundle.js?%hash%"'], null, done);
   });
 
   it('allows you to specify your own HTML template file', function(done) {
@@ -66,7 +66,7 @@ describe('HtmlWebpackPlugin', function() {
       },
       plugins: [new HtmlWebpackPlugin({template: path.join(__dirname, 'fixtures/test.html')})]
     },
-    ['<script src="app_bundle.js"', 'Some unique text'], null, done);
+    ['<script src="app_bundle.js', 'Some unique text'], null, done);
   });
 
   it('allows you to specify your own HTML template string', function(done) {
@@ -80,7 +80,7 @@ describe('HtmlWebpackPlugin', function() {
         templateContent: fs.readFileSync(path.join(__dirname, 'fixtures/test.html'), 'utf8')
       })]
     },
-    ['<script src="app_bundle.js"'], null, done);
+    ['<script src="app_bundle.js'], null, done);
   });
 
   it('registers a webpack error both template and template content are specified', function(done) {
@@ -110,7 +110,7 @@ describe('HtmlWebpackPlugin', function() {
         filename: 'index_bundle.js'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, ['<script src="index_bundle.js"'], null, done);
+    }, ['<script src="index_bundle.js?%hash%"'], null, done);
   });
 
   it('handles hashes in bundle filenames', function(done) {
@@ -121,7 +121,7 @@ describe('HtmlWebpackPlugin', function() {
         filename: 'index_bundle_[hash].js'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, [/<script src="index_bundle_[0-9a-f]+\.js"/], null, done);
+    }, [/<script src="index_bundle_[0-9a-f]+\.js\?/], null, done);
   });
 
   it('prepends the webpack public path to script src', function(done) {
@@ -133,7 +133,7 @@ describe('HtmlWebpackPlugin', function() {
         publicPath: 'http://cdn.example.com/assets/'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, ['<script src="http://cdn.example.com/assets/index_bundle.js"'], null, done);
+    }, ['<script src="http://cdn.example.com/assets/index_bundle.js?%hash%"'], null, done);
   });
 
   it('handles subdirectories in the webpack output bundles', function(done) {
@@ -144,7 +144,7 @@ describe('HtmlWebpackPlugin', function() {
         filename: 'assets/index_bundle.js'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, ['<script src="assets/index_bundle.js"'], null, done);
+    }, ['<script src="assets/index_bundle.js?%hash%"'], null, done);
   });
 
   it('handles subdirectories in the webpack output bundles along with a public path', function(done) {
@@ -156,7 +156,7 @@ describe('HtmlWebpackPlugin', function() {
         publicPath: 'http://cdn.example.com/'
       },
       plugins: [new HtmlWebpackPlugin()]
-    }, ['<script src="http://cdn.example.com/assets/index_bundle.js"'], null, done);
+    }, ['<script src="http://cdn.example.com/assets/index_bundle.js?%hash%"'], null, done);
   });
 
   it('allows you to configure the title of the generated HTML page', function(done) {
@@ -178,7 +178,7 @@ describe('HtmlWebpackPlugin', function() {
         filename: 'index_bundle.js'
       },
       plugins: [new HtmlWebpackPlugin({filename: 'test.html'})]
-    }, ['<script src="index_bundle.js"'], 'test.html', done);
+    }, ['<script src="index_bundle.js?%hash%"'], 'test.html', done);
   });
 
   it('allows you to configure the output filename with a path', function(done) {
@@ -189,12 +189,14 @@ describe('HtmlWebpackPlugin', function() {
         filename: 'index_bundle.js'
       },
       plugins: [new HtmlWebpackPlugin({filename: 'assets/test.html'})]
-    }, ['<script src="index_bundle.js"'], 'assets/test.html', done);
+    }, ['<script src="index_bundle.js?%hash%"'], 'assets/test.html', done);
   });
 
   it('allows you write multiple HTML files', function(done) {
     testHtmlPlugin({
-      entry: path.join(__dirname, 'fixtures/index.js'),
+      entry: {
+        app: path.join(__dirname, 'fixtures/index.js')
+      },
       output: {
         path: OUTPUT_DIR,
         filename: 'index_bundle.js'
@@ -206,7 +208,7 @@ describe('HtmlWebpackPlugin', function() {
           template: path.join(__dirname, 'fixtures/test.html')
         })
       ]
-    }, ['<script src="index_bundle.js"'], null, done);
+    }, ['<script src="index_bundle.js?%hash%"'], null, done);
 
     expect(fs.existsSync(path.join(__dirname, 'fixtures/test.html'))).toBe(true);
   });
diff --git a/spec/fixtures/test.html b/spec/fixtures/test.html
index f7473d1..c209f70 100644
--- a/spec/fixtures/test.html
+++ b/spec/fixtures/test.html
@@ -6,6 +6,6 @@
   </head>
   <body>
     <p>Some unique text</p>
-    <script src="{%=o.htmlWebpackPlugin.assets.app%}"></script>
+    <script src="{%=o.htmlWebpackPlugin.assets.chunks.app.entry%}"></script>
   </body>
 </html>