add test for query, parsing filename into filebase/basename

Travmatth · Travmatth · commit ba5887ecc466 · 2017-04-14T16:12:55.000-04:00
diff --git a/lib/BannerPlugin.js b/lib/BannerPlugin.js
@@ -43,7 +43,7 @@ class BannerPlugin {
 							const querySplit = filename.indexOf("?");
 
 							if(querySplit >= 0) {
-								query = filename.substr(querySplit);
+								query = filename.substr(querySplit + 1);
 								filename = filename.substr(0, querySplit);
 							}
 
diff --git a/test/configCases/plugins/banner-plugin-hashing/index.js b/test/configCases/plugins/banner-plugin-hashing/index.js
@@ -17,24 +17,28 @@ var source = require("fs")
 const banner = parseBanner(source)
 const REGEXP_HASH = /^[A-Za-z0-9]{20}$/
 
-it("should interpolate file hash in bundle0 chunk", () => {
-	REGEXP_HASH.test(banner["hash"]).should.be.true;
+it("should interpolate file hash in chunk banner", () => {
+		REGEXP_HASH.test(banner["hash"]).should.be.true;
 });
 
-it("should interpolate chunkHash in bundle0 chunk", () => {
-	REGEXP_HASH.test(banner["chunkhash"]).should.be.true;
+it("should interpolate chunkHash in chunk banner", () => {
+		REGEXP_HASH.test(banner["chunkhash"]).should.be.true;
 });
 
-it("should interpolate name in bundle0 chunk", () => {
-	banner["name"].should.equal("banner");
+it("should interpolate name in chunk banner", () => {
+		banner["name"].should.equal("dist/banner");
 });
 
-it("should interpolate extension in bundle0 chunk", () => {
-	banner["basename"].should.equal("banner.js");
+it("should interpolate basename in chunk banner", () => {
+		banner["filebase"].should.equal("banner.js");
 });
 
-it("should interpolate extension in bundle0 chunk", () => {
-	banner["query"].should.equal("");
+it("should interpolate query in chunk banner", () => {
+		banner["query"].should.equal("value");
+});
+
+it("should parse entry into basename", () => {
+		banner["filebase"].should.not.equal("name");
 });
 
 require.include("./test.js");
diff --git a/test/configCases/plugins/banner-plugin-hashing/test.config.js b/test/configCases/plugins/banner-plugin-hashing/test.config.js
@@ -2,6 +2,6 @@ var fs = require("fs");
 
 module.exports = {
 	findBundle: function(i, options) {
-		return "./banner.js";
+		return "./dist/banner.js";
 	}
 };
diff --git a/test/configCases/plugins/banner-plugin-hashing/webpack.config.js b/test/configCases/plugins/banner-plugin-hashing/webpack.config.js
@@ -1,20 +1,22 @@
-var webpack = require("../../../../");
+const webpack = require("../../../../");
+const path = require("path");
 
 module.exports = {
 	node: {
 		__dirname: false,
 		__filename: false
 	},
 	entry: {
-		banner: ["./index.js"],
+		'dist/banner': ["./index.js"],
 		vendors: ["./vendors.js"]
 	},
 	output: {
-		filename: "[name].js"
+		//path: path.join(__dirname, "dist"),
+		filename: "[name].js?value"
 	},
 	plugins: [
 		new webpack.BannerPlugin({
-			banner: "hash:[hash], chunkhash:[chunkhash], name:[name], basename:[filebase], query:[query]"
+			banner: "hash:[hash], chunkhash:[chunkhash], name:[name], filebase:[filebase], query:[query], basename:[basename]"
 		})
 	]
 };

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ class BannerPlugin {`
`43`	`43`	`const querySplit = filename.indexOf("?");`
`44`	`44`
`45`	`45`	`if(querySplit >= 0) {`
`46`		`- query = filename.substr(querySplit);`
	`46`	`+ query = filename.substr(querySplit + 1);`
`47`	`47`	`filename = filename.substr(0, querySplit);`
`48`	`48`	`}`
`49`	`49`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,6 @@ var fs = require("fs");`
`2`	`2`
`3`	`3`	`module.exports = {`
`4`	`4`	`findBundle: function(i, options) {`
`5`		`- return "./banner.js";`
	`5`	`+ return "./dist/banner.js";`
`6`	`6`	`}`
`7`	`7`	`};`