From 3f508b8c44fcf6d6af931b30661359f8934f9775 Mon Sep 17 00:00:00 2001
From: Swashata Ghosh <swashata@wpquark.com>
Date: Mon, 8 Oct 2018 20:36:05 +0530
Subject: [PATCH] test: fix failing tests due to refactor

---
 .../config/WebpackConfigHelper.spec.ts          | 15 +++++++++++----
 .../WebpackConfigHelper.spec.ts.snap            | 17 ++++++++---------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/scripts/__tests__/config/WebpackConfigHelper.spec.ts b/packages/scripts/__tests__/config/WebpackConfigHelper.spec.ts
index 9bc1ca6dd..c8881386c 100644
--- a/packages/scripts/__tests__/config/WebpackConfigHelper.spec.ts
+++ b/packages/scripts/__tests__/config/WebpackConfigHelper.spec.ts
@@ -17,6 +17,7 @@ function getConfigFromProjectAndServer(
 	sCfg: ServerConfig
 ): WebpackConfigHelperConfig {
 	return {
+		appName: pCfg.appName,
 		type: pCfg.type,
 		slug: pCfg.slug,
 		host: sCfg.host,
@@ -27,6 +28,12 @@ function getConfigFromProjectAndServer(
 		bannerConfig: pCfg.bannerConfig,
 		alias: pCfg.alias,
 		optimizeSplitChunks: pCfg.optimizeSplitChunks,
+		publicPath: `/wp-content/${pCfg.type}s/${pCfg.slug}/${
+			pCfg.outputPath
+		}/`,
+		serverUrl: `//localhost/wp-content/${pCfg.type}s/${pCfg.slug}/${
+			pCfg.outputPath
+		}/`,
 	};
 }
 
@@ -40,7 +47,6 @@ beforeEach(() => {
 			{
 				name: 'config1',
 				entry: { foo: 'bar.js', biz: ['baz.js'] },
-				filename: '[name].js',
 			},
 		],
 	};
@@ -104,7 +110,8 @@ describe('CreateWebPackConfig', () => {
 				false
 			);
 			const output = cwc.getOutput();
-			expect(output.path).toMatch(/\/config1$/);
+			expect(output.path).toMatch(/\/dist$/);
+			expect(output.filename).toBe('config1/[name].js');
 		});
 		test('has empty publicPath on production build', () => {
 			const cwc = new WebpackConfigHelper(
@@ -124,7 +131,7 @@ describe('CreateWebPackConfig', () => {
 				true
 			);
 			const devOutput = devCwc.getOutput();
-			expect(devOutput.publicPath).toMatch(/^\/\/(.*)\/config1\/$/);
+			expect(devOutput.publicPath).toMatch(/^\/\/(.*)\/dist\/$/);
 		});
 		test('respects type for constructing publicPath on dev server', () => {
 			const devCwc = new WebpackConfigHelper(
@@ -135,7 +142,7 @@ describe('CreateWebPackConfig', () => {
 			);
 			const devOutput = devCwc.getOutput();
 			expect(devOutput.publicPath).toMatch(
-				/^\/\/(.*)\/wp-content\/plugins\/(.*)\/config1\/$/
+				/^\/\/(.*)\/wp-content\/plugins\/(.*)\/dist\/$/
 			);
 		});
 	});
diff --git a/packages/scripts/__tests__/config/__snapshots__/WebpackConfigHelper.spec.ts.snap b/packages/scripts/__tests__/config/__snapshots__/WebpackConfigHelper.spec.ts.snap
index d4c0de09b..d69b01090 100644
--- a/packages/scripts/__tests__/config/__snapshots__/WebpackConfigHelper.spec.ts.snap
+++ b/packages/scripts/__tests__/config/__snapshots__/WebpackConfigHelper.spec.ts.snap
@@ -97,7 +97,7 @@ Object {
           "loader": "file-loader",
           "options": Object {
             "name": "asset-[hash].[ext]",
-            "outputPath": "assets/",
+            "outputPath": "config1/assets/",
           },
         },
       ],
@@ -130,13 +130,13 @@ Array [
       "verbose": false,
     },
     "paths": Array [
-      "/foo/bar/dist/config1",
+      "/foo/bar/dist",
     ],
   },
   MiniCssExtractPlugin {
     "options": Object {
-      "chunkFilename": "[name].css",
-      "filename": "[name].css",
+      "chunkFilename": "config1/[name].css",
+      "filename": "config1/[name].css",
     },
   },
   Object {},
@@ -157,8 +157,7 @@ This software is released under the GPL-3.0 License
 https://opensource.org/licenses/GPL-3.0
 
 Compiled with the help of https://wpack.io
-A zero setup Webpack Bundler Script for WordPress
-",
+A zero setup Webpack Bundler Script for WordPress",
       "entryOnly": false,
       "include": /\\\\\\.\\(\\(t\\|j\\)sx\\?\\|s\\?\\(c\\|a\\)ss\\)\\$/,
       "raw": false,
@@ -183,13 +182,13 @@ Array [
       "verbose": false,
     },
     "paths": Array [
-      "/foo/bar/dist/config1",
+      "/foo/bar/dist",
     ],
   },
   MiniCssExtractPlugin {
     "options": Object {
-      "chunkFilename": "[name].css",
-      "filename": "[name].css",
+      "chunkFilename": "config1/[name].css",
+      "filename": "config1/[name].css",
     },
   },
   Object {},