From 708dabe34bbc1c9089f92f1f4903677374c70faa Mon Sep 17 00:00:00 2001
From: Kirill Nagaitsev <knagaitsev1@gmail.com>
Date: Sat, 22 Feb 2020 01:36:12 -0600
Subject: [PATCH] tests(loader-generator): fix loader generator tests and
 update package locks

---
 .../__tests__/loader-generator.test.ts           | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/packages/generators/__tests__/loader-generator.test.ts b/packages/generators/__tests__/loader-generator.test.ts
index 55707ac105c..6b5d28fd084 100644
--- a/packages/generators/__tests__/loader-generator.test.ts
+++ b/packages/generators/__tests__/loader-generator.test.ts
@@ -1,31 +1,31 @@
 import { join } from 'path';
 import { run } from 'yeoman-test';
-import assert from 'yeoman-assert';
+import * as assert from 'yeoman-assert';
 
 import { makeLoaderName } from '../loader-generator';
 
 describe('loader generator', () => {
-    it.skip('generates a default loader', async () => {
+    it('generates a default loader', async () => {
         const outputDir = await run(join(__dirname, '../loader-generator'));
-        const loaderDir = `${outputDir}/my-loader`;
+        const loaderDir = join(outputDir, 'my-loader');
         const srcFiles = ['cjs.js', 'index.js'];
         const testFiles = ['functional.test.js', 'test-utils.js', 'unit.test.js', 'fixtures/simple-file.js'];
         const exampleFiles = ['webpack.config.js', 'src/index.js', 'src/lazy-module.js', 'src/static-esm-module.js'];
 
         // Check that files in all folders are scaffolded. Checking them separately so we know which directory has the problem
         // assert for src files
-        assert.file([...srcFiles.map(file => `${loaderDir}/src/${file}`)]);
+        assert.file(srcFiles.map(file => join(loaderDir, 'src', file)));
 
         // assert for test files
-        assert.file([...testFiles.map(file => `${loaderDir}/test/${file}`)]);
+        assert.file(testFiles.map(file => join(loaderDir, 'test', file)));
 
         // assert for example files
-        assert.file([...exampleFiles.map(file => `${loaderDir}/examples/simple/${file}`)]);
+        assert.file(exampleFiles.map(file => join(loaderDir, 'examples/simple', file)));
 
         // Check the contents of the webpack config and loader file
         assert.fileContent([
-            [`${loaderDir}/examples/simple/webpack.config.js`, /resolveLoader: {/],
-            [`${loaderDir}/src/index.js`, /export default function loader(source) {/],
+            [join(loaderDir, 'examples/simple/webpack.config.js'), /resolveLoader: {/],
+            [join(loaderDir, 'src/index.js'), /export default function loader\(source\) {/],
         ]);
 
         // higher timeout so travis has enough time to execute