Test feedback

FredKSchott · Dec 8, 2020 · ceec16f · ceec16f
1 parent a5d7608
commit ceec16f
Show file tree

Hide file tree

Showing 31 changed files with 168 additions and 157 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
@@ -5,24 +5,24 @@ const {setupBuildTest, readFiles} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 let files = {};
-let $;
 
 describe('buildOptions.baseUrl', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html'], {cwd});
-    $ = cheerio.load(files['/index.html']);
+    files = await readFiles(cwd);
   });
 
   it('baseUrl works for <link>', () => {
+    const $ = cheerio.load(files['/index.html']);
     expect($('link[rel="icon"]').attr('href').startsWith('https://www.example.com/')).toBe(true);
     expect($('link[rel="stylesheet"]').attr('href').startsWith('https://www.example.com/')).toBe(
       true,
     );
   });
 
   it('baseUrl works for <script>', () => {
+    const $ = cheerio.load(files['/index.html']);
     expect($('script').attr('src').startsWith('https://www.example.com/')).toBe(true);
   });
 });
diff --git a/test/build/base-url/base-url.test.js b/test/build/base-url/base-url.test.js
@@ -5,22 +5,22 @@ const {setupBuildTest, readFiles} = require('../../test-utils');
 const cwd = path.join(__dirname, 'build');
 
 let files = {};
-let $;
 
 describe('buildOptions.baseUrl', () => {
-  beforeAll(() => {
-    setupBuildTest(__dirname);
+  beforeAll(async () => {
+    await setupBuildTest(__dirname);
 
-    files = readFiles(['index.html', 'index.js', '_dist_/index.js'], {cwd});
-    $ = cheerio.load(files['/index.html']);
+    files = await readFiles(cwd);
   });
 
   it('baseUrl works for <link>', () => {
+    const $ = cheerio.load(files['/index.html']);
     expect($('link[rel="icon"]').attr('href').startsWith('/static/')).toBe(true);
     expect($('link[rel="stylesheet"]').attr('href').startsWith('/static/')).toBe(true);
   });
 
   it('baseUrl works for <script>', () => {
+    const $ = cheerio.load(files['/index.html']);
     expect($('script').attr('src').startsWith('/static/')).toBe(true);
   });
 

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,15 +3,15 @@ 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
   it('built', () => {
-    const webModule = path.join(__dirname, 'build', 'web_modules', 'array-flatten.js');
+    const webModuleLoc = path.join(__dirname, 'build', 'web_modules', 'array-flatten.js');
 
-    expect(fs.existsSync(webModule)).toBe(true);
-    expect(fs.readFileSync(webModule, 'utf-8')).toBeTruthy();
+    expect(fs.existsSync(webModuleLoc)).toBe(true);
+    expect(fs.readFileSync(webModuleLoc, 'utf-8')).toBeTruthy();
   });
 });
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,16 +6,16 @@ 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', () => {
-    const envFile = path.join(cwd, 'static', 'snowpack', 'env.js');
-    expect(fs.existsSync(envFile)).toBe(true); // file exists
-    expect(fs.readFileSync(envFile, 'utf-8')).toBeTruthy(); // file has contents
+    const envFileLoc = path.join(cwd, 'static', 'snowpack', 'env.js');
+    expect(fs.existsSync(envFileLoc)).toBe(true); // file exists
+    expect(fs.readFileSync(envFileLoc, 'utf-8')).toBeTruthy(); // file has contents
   });
 
   it('resolves 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,15 +5,15 @@ 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', () => {
-    const distJS = path.join(cwd, 'src', 'index.js');
-    expect(fs.existsSync(distJS)).toBe(true);
+    const distJSLoc = path.join(cwd, 'src', 'index.js');
+    expect(fs.existsSync(distJSLoc)).toBe(true);
 
-    const snowpackMeta = path.join(cwd, '__snowpack__', 'env.js');
-    expect(fs.existsSync(snowpackMeta)).toBe(true);
+    const snowpackMetaLoc = path.join(cwd, '__snowpack__', 'env.js');
+    expect(fs.existsSync(snowpackMetaLoc)).toBe(true);
   });
 });
diff --git a/test/build/config-out/config-out.test.js b/test/build/config-out/config-out.test.js
@@ -5,15 +5,15 @@ 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', () => {
-    const distJS = path.join(cwd, 'src', 'index.js');
-    expect(fs.existsSync(distJS)).toBe(true);
+    const distJSLoc = path.join(cwd, 'src', 'index.js');
+    expect(fs.existsSync(distJSLoc)).toBe(true);
 
-    const snowpackMeta = path.join(cwd, '__snowpack__', 'env.js');
-    expect(fs.existsSync(snowpackMeta)).toBe(true);
+    const snowpackMetaLoc = path.join(cwd, '__snowpack__', 'env.js');
+    expect(fs.existsSync(snowpackMetaLoc)).toBe(true);
   });
 });
diff --git a/test/build/config-treeshake/config-treeshake.test.js b/test/build/config-treeshake/config-treeshake.test.js
@@ -7,21 +7,21 @@ 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', () => {
-    const webModule = path.join(cwd, 'web_modules', 'array-flatten.js');
+    const webModuleLoc = path.join(cwd, 'web_modules', 'array-flatten.js');
 
-    expect(fs.existsSync(webModule)).toBe(true); // file exists
-    expect(fs.readFileSync(webModule, 'utf-8')).toBeTruthy(); // file has contents
+    expect(fs.existsSync(webModuleLoc)).toBe(true); // file exists
+    expect(fs.readFileSync(webModuleLoc, 'utf-8')).toBeTruthy(); // file has contents
   });
 
   it('built web_modules/async.js', () => {
-    const webModule = path.join(cwd, 'web_modules', 'async.js');
+    const webModuleLoc = path.join(cwd, 'web_modules', 'async.js');
 
-    expect(fs.existsSync(webModule)).toBe(true); // file exists
-    expect(fs.readFileSync(webModule, 'utf-8')).toBeTruthy(); // file has contents
+    expect(fs.existsSync(webModuleLoc)).toBe(true); // file exists
+    expect(fs.readFileSync(webModuleLoc, 'utf-8')).toBeTruthy(); // file has contents
   });
 });
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,13 +5,13 @@ 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', () => {
-    const webModule = path.join(cwd, '_dist_', 'index.js');
+    const webModuleLoc = path.join(cwd, '_dist_', 'index.js');
 
-    expect(fs.existsSync(webModule)).toBe(true);
+    expect(fs.existsSync(webModuleLoc)).toBe(true);
   });
 });
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', () => {