test: use @webpack-contrib/test-utils

michael-ciniawsky · michael-ciniawsky · commit 8622775b2c87 · 2018-02-06T04:17:48.000+01:00
diff --git a/test/Errors.test.js b/test/Errors.test.js
@@ -1,6 +1,6 @@
 /* eslint-disable */
 import loader from '../src';
-import webpack from './helpers/compiler';
+import webpack from '@webpack-contrib/test-utils';
 
 describe('Errors', () => {
   test('Loader Error', async () => {
@@ -23,10 +23,19 @@ describe('Errors', () => {
     expect(err).toThrowErrorMatchingSnapshot();
   });
 
-  test('Validation Error', () => {
-    const err = () => loader.call({ query: { template: 1 } });
+  test('Validation Error', async () => {
+    const config = {
+      loader: {
+        test: /\.html$/,
+        options: {
+          template: 1,
+        },
+      },
+    };
 
-    expect(err).toThrow();
-    expect(err).toThrowErrorMatchingSnapshot();
+    const stats = await webpack('error.js', config);
+    const { errors } = stats.toJson()
+
+    errors.forEach((error) => expect(error).toMatchSnapshot());
   });
 });
diff --git a/test/__snapshots__/Errors.test.js.snap b/test/__snapshots__/Errors.test.js.snap
@@ -8,8 +8,10 @@ tree.forEach is not a function
 `;
 
 exports[`Errors Validation Error 1`] = `
-"HTML Loader Invalid Options
+"./fixture.html
+Module build failed: ValidationError: HTML Loader Invalid Options
 
 options.template should be boolean,string
-"
+
+ @ ./error.js 1:0-34 3:15-19"
 `;
diff --git a/test/__snapshots__/loader.test.js.snap b/test/__snapshots__/loader.test.js.snap
@@ -14,10 +14,11 @@ export default \`<!DOCTYPE html>
   <title>HTML Loader</title>
 </head>
 <body>
-  <!-- HTML Content -->
   <div id=\\"app\\"></div>
+
   <!-- HTML Import -->
   \${HTML__IMPORT__0}
+
   <!-- HTML URL -->
   <img src=\\"\${HTML__URL__0}\\">
 </body>
diff --git a/test/e2e/__snapshots__/html.test.js.snap b/test/e2e/__snapshots__/html.test.js.snap
@@ -10,5 +10,7 @@ exports[`E2E HTML 1`] = `
   <!-- HTML URL -->
   <img src=\\"9c87cbf3ba33126ffd25ae7f2f6bbafb.png\\">
 </div>
+
+  
 "
 `;
diff --git a/test/e2e/__snapshots__/template.test.js.snap b/test/e2e/__snapshots__/template.test.js.snap
@@ -10,5 +10,7 @@ exports[`E2E Templates 1`] = `
   <!-- HTML URL -->
   <img src=\\"9c87cbf3ba33126ffd25ae7f2f6bbafb.png\\">
 </div>
+
+  
 "
 `;
diff --git a/test/e2e/html.test.js b/test/e2e/html.test.js
@@ -1,7 +1,6 @@
 /* eslint-disable */
 import path from 'path';
-import dom from '../helpers/dom';
-import webpack from '../helpers/compiler';
+import webpack, { dom } from '@webpack-contrib/test-utils';
 
 describe('E2E', () => {
   test('HTML', async () => {
@@ -28,7 +27,7 @@ describe('E2E', () => {
 
     const scripts = {
       main: assets['main.js'].source(),
-      runtime: assets['runtime.js'].source(),
+      runtime: assets['main-runtime.js'].source(),
     };
 
     const { window } = dom([scripts.runtime, scripts.main]);
diff --git a/test/e2e/template.test.js b/test/e2e/template.test.js
@@ -1,7 +1,6 @@
 /* eslint-disable */
 import path from 'path';
-import dom from '../helpers/dom';
-import webpack from '../helpers/compiler';
+import webpack, { dom } from '@webpack-contrib/test-utils';
 
 describe('E2E', () => {
   test('Templates', async () => {
@@ -28,7 +27,7 @@ describe('E2E', () => {
 
     const scripts = {
       main: assets['main.js'].source(),
-      runtime: assets['runtime.js'].source(),
+      runtime: assets['main-runtime.js'].source(),
     };
 
     const { window } = dom([scripts.runtime, scripts.main]);
diff --git a/test/fixtures/file.html b/test/fixtures/file.html
@@ -0,0 +1 @@
+<div class="import"></div>
diff --git a/test/fixtures/file.png b/test/fixtures/file.png
diff --git a/test/fixtures/fixture.html b/test/fixtures/fixture.html
@@ -5,10 +5,11 @@
   <title>HTML Loader</title>
 </head>
 <body>
-  <!-- HTML Content -->
   <div id="app"></div>
+
   <!-- HTML Import -->
   <import src="./file.html"></import>
+
   <!-- HTML URL -->
   <img src="./file.png">
 </body>
diff --git a/test/helpers/compiler.js b/test/helpers/compiler.js
diff --git a/test/helpers/dom.js b/test/helpers/dom.js
diff --git a/test/loader.test.js b/test/loader.test.js
@@ -1,17 +1,30 @@
 /* eslint-disable */
-import webpack from './helpers/compiler';
+import path from 'path';
+import webpack from '@webpack-contrib/test-utils';
 
 describe('Loader', () => {
   test('Defaults', async () => {
     const config = {
-      loader: {
-        test: /\.html$/,
-        options: {},
-      },
-    };
+      rules: [
+        {
+          test: /\.html$/,
+          use: [
+            {
+              loader: path.resolve('src'),
+              options: {},
+            },
+          ],
+        },
+        {
+          test: /\.png$/,
+          use: ['file-loader'],
+        },
+      ],
+    }
 
     const stats = await webpack('fixture.js', config);
-    const { source } = stats.toJson().modules[1];
+    const { source } = stats.toJson().modules[2];
+
 
     expect(source).toMatchSnapshot();
   });
diff --git a/test/options/import.test.js b/test/options/import.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable */
-import webpack from '../helpers/compiler';
+import webpack from '@webpack-contrib/test-utils';
 
 describe('Options', () => {
   describe('import', () => {
@@ -12,7 +12,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/import/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -28,7 +28,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/import/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -44,7 +44,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/import/filter/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -62,7 +62,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/import/filter/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
diff --git a/test/options/minimize.test.js b/test/options/minimize.test.js
@@ -1,5 +1,5 @@
 /* eslint-disable */
-import webpack from '../helpers/compiler';
+import webpack from '@webpack-contrib/test-utils';
 
 describe('Options', () => {
   describe('minimize', () => {
@@ -14,7 +14,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/minimize/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
diff --git a/test/options/template.test.js b/test/options/template.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable
   prefer-destructuring,
 */
-import webpack from '../helpers/compiler';
+import webpack from '@webpack-contrib/test-utils';
 
 describe('Options', () => {
   describe('template', () => {
@@ -16,7 +16,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/template/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -32,7 +32,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/template/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
diff --git a/test/options/url.test.js b/test/options/url.test.js
@@ -1,7 +1,7 @@
 /* eslint-disable
   prefer-destructuring,
 */
-import webpack from '../helpers/compiler';
+import webpack from '@webpack-contrib/test-utils';
 
 describe('Options', () => {
   describe('url', () => {
@@ -14,7 +14,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/url/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -30,7 +30,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/url/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -46,7 +46,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/url/filter/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });
@@ -64,7 +64,7 @@ describe('Options', () => {
       };
 
       const stats = await webpack('options/url/filter/fixture.js', config);
-      const { source } = stats.toJson().modules[1];
+      const { source } = stats.toJson().modules[0];
 
       expect(source).toMatchSnapshot();
     });

Original file line number	Diff line number	Diff line change
@@ -10,5 +10,7 @@ exports[`E2E HTML 1`] = `
`10`	`10`	`<!-- HTML URL -->`
`11`	`11`	`<img src=\\"9c87cbf3ba33126ffd25ae7f2f6bbafb.png\\">`
`12`	`12`	`</div>`
	`13`	`+`
	`14`	`+`
`13`	`15`	`"`
`14`	`16`	`;
Original file line number	Diff line number	Diff line change
@@ -10,5 +10,7 @@ exports[`E2E Templates 1`] = `
`10`	`10`	`<!-- HTML URL -->`
`11`	`11`	`<img src=\\"9c87cbf3ba33126ffd25ae7f2f6bbafb.png\\">`
`12`	`12`	`</div>`
	`13`	`+`
	`14`	`+`
`13`	`15`	`"`
`14`	`16`	`;