TouchInstinct
/
html-webpack-plugin
301
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix rebase

This commit is contained in:
Jan Nicklas 2015-06-29 16:08:54 +02:00
parent 39cfc493a0
commit a8677988bd
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spec/HtmlWebpackPluginSpec.js
View File

@ -24,14 +24,11 @@ function testHtmlPlugin(webpackConfig, expectedResults, outputFile, done, expect
} else {
expect(compilationWarnings).toBe('');
}
<<<<<<< HEAD
=======
var outputFileExists = fs.existsSync(path.join(OUTPUT_DIR, outputFile));
expect(outputFileExists).toBe(true);
if(!outputFileExists) {
return done();
}
>>>>>>> Fix chunk filtering
}
var htmlContent = fs.readFileSync(path.join(OUTPUT_DIR, outputFile)).toString();
for (var i = 0; i < expectedResults.length; i++) {