Test feedback

FredKSchott · Dec 7, 2020 · 79f483f · 79f483f
1 parent 1f42e44
commit 79f483f
Show file tree

Hide file tree

Showing 31 changed files with 125 additions and 113 deletions.
diff --git a/test/build/base-url-homepage/base-url-homepage.test.js b/test/build/base-url-homepage/base-url-homepage.test.js
@@ -7,10 +7,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('packageManifest.homepage', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('baseUrl works for <link>', () => {

diff --git a/test/build/base-url-remote/base-url-remote.test.js b/test/build/base-url-remote/base-url-remote.test.js
@@ -8,10 +8,10 @@ let files = {};
 let $;
 
 describe('buildOptions.baseUrl', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html'], {cwd});
+    files = await readFiles(cwd);
     $ = cheerio.load(files['/index.html']);
   });
 

diff --git a/test/build/base-url/base-url.test.js b/test/build/base-url/base-url.test.js
@@ -8,10 +8,10 @@ let files = {};
 let $;
 
 describe('buildOptions.baseUrl', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html', 'index.js', '_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
     $ = cheerio.load(files['/index.html']);
   });
 

diff --git a/test/build/bugfix-named-import/bugfix-named-import.test.js b/test/build/bugfix-named-import/bugfix-named-import.test.js
@@ -3,8 +3,8 @@ const path = require('path');
 const {setupBuildTest} = require('../../test-utils');
 
 describe('bugfix: named import', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   // if this file built successfully, then the ipmort worked

diff --git a/test/build/cdn/cdn.test.js b/test/build/cdn/cdn.test.js
@@ -7,10 +7,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('CDN URLs', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html', '_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('HTML: preserves remote URLs', () => {

diff --git a/test/build/config-alias/config-alias.test.js b/test/build/config-alias/config-alias.test.js
@@ -6,12 +6,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('config: alias', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['_dist_/index.js', '_dist_/index.html', '_dist_/components/style.css'], {
-      cwd,
-    });
+    files = await readFiles(cwd);
   });
 
   it('web_modules can be aliased', () => {

diff --git a/test/build/config-extends-plugins/config-extends-plugins.test.js b/test/build/config-extends-plugins/config-extends-plugins.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 describe('config: extends', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('loads the appropriate plugins', () => {

diff --git a/test/build/config-external-package/config-external-package.test.js b/test/build/config-external-package/config-external-package.test.js
@@ -6,10 +6,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('config: installOptions.externalPackage', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('preserves external package', () => {

diff --git a/test/build/config-instantiated-object/config-instantiated-object.test.js b/test/build/config-instantiated-object/config-instantiated-object.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 describe('config: instantiated objects', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('instantiated objects don’t affect build', () => {

diff --git a/test/build/config-meta-dir/config-meta-dir.test.js b/test/build/config-meta-dir/config-meta-dir.test.js
@@ -6,10 +6,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('config: buildOptions.metaDir', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.js', 'sub/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('builds snowpack env', () => {

diff --git a/test/build/config-mount/config-mount.test.js b/test/build/config-mount/config-mount.test.js
@@ -18,10 +18,10 @@ function generateContentsMap(dir) {
 }
 
 describe('config: mount', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['h/main.html', 'i/index.js', 'new-g/index.js', 'new-g/main.html'], {cwd});
+    files = await readFiles(cwd);
   });
 
   describe('basic', () => {

diff --git a/test/build/config-out-flag/config-out-flag.test.js b/test/build/config-out-flag/config-out-flag.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'TEST_BUILD_OUT');
 
 describe('CLI: --out flag', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('respects --out', () => {

diff --git a/test/build/config-out/config-out.test.js b/test/build/config-out/config-out.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'TEST_BUILD_OUT');
 
 describe('config: buildOptions.out', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('respects buildOptions.out', () => {

diff --git a/test/build/config-treeshake/config-treeshake.test.js b/test/build/config-treeshake/config-treeshake.test.js
@@ -7,8 +7,8 @@ const cwd = path.join(__dirname, 'build');
 // Note(drew): full disclosure, I do not know what this test was originally-testing; it was not clear from the snapshot (the snapshot had functions that seemed like they should have been treeshaken)
 
 describe('installOptions.treeshake', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('built web_modules/array-flatten.js', () => {

diff --git a/test/build/config-ts-file/config-ts-file.test.js b/test/build/config-ts-file/config-ts-file.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 describe('config: TypeScript config', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('mounts & builds correctly', () => {

diff --git a/test/build/css-modules/css-modules.test.js b/test/build/css-modules/css-modules.test.js
@@ -5,10 +5,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['src/App.module.css', 'src/App.module.css.proxy.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('builds css.proxy.js file', () => {

diff --git a/test/build/custom-modules-dir/custom-modules-dir.test.js b/test/build/custom-modules-dir/custom-modules-dir.test.js
@@ -6,10 +6,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('buildOptions.webModulesUrl', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('snowpack: installs in specified directory', () => {

diff --git a/test/build/entrypoint-ids/entrypoint-ids.test.js b/test/build/entrypoint-ids/entrypoint-ids.test.js
@@ -7,11 +7,11 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('core: web_modules resolution', () => {
-  beforeAll(() => {
+  beforeAll(async () => {
     const capitalize = os.platform() === 'win32'; // for Windows, we capitalize this one directory to see if Snowpack can still resolve
-    setupBuildTest(capitalize ? __dirname.toUpperCase() : __dirname);
+    await setupBuildTest(capitalize ? __dirname.toUpperCase() : __dirname);
 
-    files = readFiles(['_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('resolves web_modules without case-sensitivity', () => {

diff --git a/test/build/html-environment-variables/html-environment-variables.test.js b/test/build/html-environment-variables/html-environment-variables.test.js
@@ -5,10 +5,10 @@ const {setupBuildTest, readFiles} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 let files = {};
 describe('html-environment-variables', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('passes env vars into HTML', () => {

diff --git a/test/build/import-assets/import-assets.test.js b/test/build/import-assets/import-assets.test.js
@@ -5,11 +5,9 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('import resource', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
-    files = readFiles(['_dist_/index.js', '_dist_/styles.css', '_dist_/styles.css.proxy.js'], {
-      cwd,
-    });
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
+    files = await readFiles(cwd);
   });
 
   describe('css', () => {

diff --git a/test/build/import-json/import-json.test.js b/test/build/import-json/import-json.test.js
@@ -1,38 +1,29 @@
 const path = require('path');
-const {setupBuildTest, readFiles} = require('../../test-utils');
+const {setupBuildTest, readFiles, stripWS} = require('../../test-utils');
 
-const STRIP_WHITESPACE = /((\s+$)|((\\r\\n)|(\\n)))/gm;
 const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('import-json', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
-    files = readFiles(
-      [
-        '_dist_/index.js',
-        '_dist_/file.json.proxy.js',
-        'web_modules/json-test-pkg/file.json.proxy.js',
-      ],
-      {
-        cwd,
-      },
-    );
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
+    files = await readFiles(cwd);
   });
 
   it('imports in source file are transformed correctly', () => {
-    expect(files['/_dist_/index.js'].replace(STRIP_WHITESPACE, '')).toEqual(`import testJsonData from './file.json.proxy.js';
+    expect(stripWS(files['/_dist_/index.js']))
+      .toEqual(`import testJsonData from './file.json.proxy.js';
 import testJsonPkgData from '../web_modules/json-test-pkg/file.json.proxy.js';
 console.log('loaded:', testJsonData, testJsonPkgData);`);
   });
 
   it('local json file is built as expected', () => {
-    expect(files['/_dist_/file.json.proxy.js'].replace(STRIP_WHITESPACE, '')).toEqual(`let json = {"test":true};
+    expect(stripWS(files['/_dist_/file.json.proxy.js'])).toEqual(`let json = {"test":true};
 export default json;`);
   });
 
   it('npm package json file is imported as expected', () => {
-    expect(files['/web_modules/json-test-pkg/file.json.proxy.js'].replace(STRIP_WHITESPACE, ''))
+    expect(stripWS(files['/web_modules/json-test-pkg/file.json.proxy.js']))
       .toEqual(`let json = {"test-json-pkg":true};
 export default json;`);
   });

diff --git a/test/build/legacy-mount-scripts/legacy-mount.test.js b/test/build/legacy-mount-scripts/legacy-mount.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 describe('config: mount scripts (legacy)', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('mounted ./src', () => {

diff --git a/test/build/module-resolution/module-resolution.test.js b/test/build/module-resolution/module-resolution.test.js
@@ -5,13 +5,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('module resolution', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(
-      ['src.js', 'index.html', 'folder-1/index.html', 'folder-1/folder-2/index.html'],
-      {cwd},
-    );
+    files = await readFiles(cwd);
   });
 
   it('JS: resolves web_modules relatively', () => {

diff --git a/test/build/package-bootstrap/package-bootstrap.test.js b/test/build/package-bootstrap/package-bootstrap.test.js
@@ -5,10 +5,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('package: bootstrap', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('resolves JS', () => {

diff --git a/test/build/package-tippy-js/package-tippy-js.test.js b/test/build/package-tippy-js/package-tippy-js.test.js
@@ -6,10 +6,10 @@ const cwd = path.join(__dirname, 'build');
 let files = {};
 
 describe('package: tippy.js', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['_dist_/index.js'], {cwd});
+    files = await readFiles(cwd);
   });
 
   it('builds to the correct path', () => {

diff --git a/test/build/plugin-build-script/plugin-build-script.test.js b/test/build/plugin-build-script/plugin-build-script.test.js
@@ -5,8 +5,8 @@ const {setupBuildTest} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 describe('@snowpack/plugin-build-script', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('runs Babel on TS', () => {

diff --git a/test/build/plugin-hook-optimize/plugin-hook-optimize.test.js b/test/build/plugin-hook-optimize/plugin-hook-optimize.test.js
@@ -4,8 +4,8 @@ const glob = require('glob');
 const {setupBuildTest} = require('../../test-utils');
 
 describe('plugin API: optimize()', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
   });
 
   it('generates artifact.txt', () => {