test: coverage

evilebottnawi · web-flow · commit dd9ce508225d · 2020-05-15T19:44:26.000+03:00
diff --git a/src/options.json b/src/options.json
@@ -100,5 +100,6 @@
         }
       }
     }
-  }
+  },
+  "required": ["patterns"]
 }
diff --git a/src/postProcessPattern.js b/src/postProcessPattern.js
@@ -22,7 +22,7 @@ export default async function postProcessPattern(globalRef, pattern, file) {
   logger.debug(`getting stats for '${file.absoluteFrom}' to write to assets`);
 
   const getStats = pattern.stats
-    ? Promise.resolve().then(() => pattern.stats)
+    ? pattern.stats
     : stat(inputFileSystem, file.absoluteFrom);
 
   let stats;
@@ -31,13 +31,16 @@ export default async function postProcessPattern(globalRef, pattern, file) {
     stats = await getStats;
   } catch (error) {
     compilation.errors.push(error);
+
     return;
   }
 
   if (stats.isDirectory()) {
     logger.debug(
       `skipping '${file.absoluteFrom}' because it is empty directory`
     );
+
+    return;
   }
 
   // If this came from a glob, add it to the file watchlist
diff --git a/src/processPattern.js b/src/processPattern.js
@@ -31,7 +31,15 @@ export default async function processPattern(globalRef, pattern) {
     return Promise.resolve();
   }
 
-  return paths.map((from) => {
+  return paths.map((filepath) => {
+    let from;
+
+    if (typeof filepath === 'string') {
+      from = filepath;
+    } else {
+      from = filepath.path;
+    }
+
     const file = { absoluteFrom: path.resolve(pattern.context, from) };
 
     file.relativeFrom = path.relative(pattern.context, file.absoluteFrom);
@@ -43,13 +51,10 @@ export default async function processPattern(globalRef, pattern) {
     logger.debug(`found ${from}`);
 
     // Change the to path to be relative for webpack
-    if (pattern.toType === 'dir') {
-      file.webpackTo = path.join(pattern.to, file.relativeFrom);
-    } else if (pattern.toType === 'file') {
-      file.webpackTo = pattern.to || file.relativeFrom;
-    } else if (pattern.toType === 'template') {
-      file.webpackTo = pattern.to;
-    }
+    file.webpackTo =
+      pattern.toType === 'dir'
+        ? path.join(pattern.to, file.relativeFrom)
+        : pattern.to;
 
     if (path.isAbsolute(file.webpackTo)) {
       file.webpackTo = path.relative(output, file.webpackTo);
diff --git a/src/utils/createPatternGlob.js b/src/utils/createPatternGlob.js
@@ -18,11 +18,9 @@ function createPatternGlob(pattern, globalRef) {
 
   // eslint-disable-next-line no-param-reassign
   pattern.globOptions = {
-    ...{
-      cwd: pattern.context,
-      followSymbolicLinks: true,
-    },
+    ...{ followSymbolicLinks: true },
     ...(pattern.globOptions || {}),
+    ...{ cwd: pattern.context },
   };
 
   switch (pattern.fromType) {
@@ -44,7 +42,6 @@ function createPatternGlob(pattern, globalRef) {
         pattern.globOptions.dot = true;
       }
       /* eslint-enable no-param-reassign */
-
       break;
     case 'file':
       logger.debug(`determined '${pattern.absoluteFrom}' is a file`);
@@ -60,7 +57,6 @@ function createPatternGlob(pattern, globalRef) {
         pattern.globOptions.dot = true;
       }
       /* eslint-enable no-param-reassign */
-
       break;
     default: {
       logger.debug(`determined '${pattern.absoluteFrom}' is a glob`);
diff --git a/test/CopyPlugin.test.js b/test/CopyPlugin.test.js
@@ -488,7 +488,7 @@ describe('CopyPlugin', () => {
   });
 
   describe('logging', () => {
-    it('should logging', (done) => {
+    it('should logging when "from" is a file', (done) => {
       const expectedAssetKeys = ['file.txt'];
 
       run({
@@ -504,12 +504,81 @@ describe('CopyPlugin', () => {
             .get('copy-webpack-plugin')
             .map((entry) =>
               entry.args[0].replace(/\\/g, '/').split(root).join('.')
-            );
+            )
+            .sort();
 
           expect(
             Array.from(Object.keys(readAssets(compiler, stats))).sort()
           ).toEqual(expectedAssetKeys);
-          expect({ result: logs }).toMatchSnapshot({ result: logs });
+          expect({ logs }).toMatchSnapshot('logs');
+        })
+        .then(done)
+        .catch(done);
+    });
+
+    it('should logging when "from" is a directory', (done) => {
+      const expectedAssetKeys = [
+        '.dottedfile',
+        'directoryfile.txt',
+        'nested/deep-nested/deepnested.txt',
+        'nested/nestedfile.txt',
+      ];
+
+      run({
+        patterns: [
+          {
+            from: 'directory',
+          },
+        ],
+      })
+        .then(({ compiler, stats }) => {
+          const root = path.resolve(__dirname).replace(/\\/g, '/');
+          const logs = stats.compilation.logging
+            .get('copy-webpack-plugin')
+            .map((entry) =>
+              entry.args[0].replace(/\\/g, '/').split(root).join('.')
+            )
+            .sort();
+
+          expect(
+            Array.from(Object.keys(readAssets(compiler, stats))).sort()
+          ).toEqual(expectedAssetKeys);
+          expect({ logs }).toMatchSnapshot('logs');
+        })
+        .then(done)
+        .catch(done);
+    });
+
+    it('should logging when "from" is a glob', (done) => {
+      const expectedAssetKeys = [
+        'directory/directoryfile.txt',
+        'directory/nested/deep-nested/deepnested.txt',
+        'directory/nested/nestedfile.txt',
+      ];
+
+      run({
+        patterns: [
+          {
+            from: 'directory/**',
+            globOptions: {
+              onlyFiles: false,
+            },
+          },
+        ],
+      })
+        .then(({ compiler, stats }) => {
+          const root = path.resolve(__dirname).replace(/\\/g, '/');
+          const logs = stats.compilation.logging
+            .get('copy-webpack-plugin')
+            .map((entry) =>
+              entry.args[0].replace(/\\/g, '/').split(root).join('.')
+            )
+            .sort();
+
+          expect(
+            Array.from(Object.keys(readAssets(compiler, stats))).sort()
+          ).toEqual(expectedAssetKeys);
+          expect({ logs }).toMatchSnapshot('logs');
         })
         .then(done)
         .catch(done);
diff --git a/test/__snapshots__/CopyPlugin.test.js.snap b/test/__snapshots__/CopyPlugin.test.js.snap
@@ -1,20 +1,94 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`CopyPlugin logging should logging 1`] = `
+exports[`CopyPlugin logging should logging when "from" is a directory: logs 1`] = `
 Object {
-  "result": Array [
+  "logs": Array [
+    "add ./fixtures/directory as contextDependencies",
+    "begin globbing './fixtures/directory/**/*' with a context of './fixtures/directory'",
+    "determined './fixtures/directory' is a directory",
+    "determined that './fixtures/directory/.dottedfile' should write to '.dottedfile'",
+    "determined that './fixtures/directory/directoryfile.txt' should write to 'directoryfile.txt'",
+    "determined that './fixtures/directory/nested/deep-nested/deepnested.txt' should write to 'nested/deep-nested/deepnested.txt'",
+    "determined that './fixtures/directory/nested/nestedfile.txt' should write to 'nested/nestedfile.txt'",
+    "end to adding additional assets",
+    "found ./fixtures/directory/.dottedfile",
+    "found ./fixtures/directory/directoryfile.txt",
+    "found ./fixtures/directory/nested/deep-nested/deepnested.txt",
+    "found ./fixtures/directory/nested/nestedfile.txt",
+    "getting stats for './fixtures/directory' to determinate 'fromType'",
+    "getting stats for './fixtures/directory/.dottedfile' to write to assets",
+    "getting stats for './fixtures/directory/directoryfile.txt' to write to assets",
+    "getting stats for './fixtures/directory/nested/deep-nested/deepnested.txt' to write to assets",
+    "getting stats for './fixtures/directory/nested/nestedfile.txt' to write to assets",
+    "processing from: 'directory' to: '.'",
+    "reading './fixtures/directory/.dottedfile' to write to assets",
+    "reading './fixtures/directory/directoryfile.txt' to write to assets",
+    "reading './fixtures/directory/nested/deep-nested/deepnested.txt' to write to assets",
+    "reading './fixtures/directory/nested/nestedfile.txt' to write to assets",
     "start to adding additional assets",
-    "processing from: 'file.txt' to: '.'",
-    "getting stats for './fixtures/file.txt' to determinate 'fromType'",
-    "determined './fixtures/file.txt' is a file",
+    "writing '.dottedfile' to compilation assets from './fixtures/directory/.dottedfile'",
+    "writing 'directoryfile.txt' to compilation assets from './fixtures/directory/directoryfile.txt'",
+    "writing 'nested/deep-nested/deepnested.txt' to compilation assets from './fixtures/directory/nested/deep-nested/deepnested.txt'",
+    "writing 'nested/nestedfile.txt' to compilation assets from './fixtures/directory/nested/nestedfile.txt'",
+  ],
+}
+`;
+
+exports[`CopyPlugin logging should logging when "from" is a file: logs 1`] = `
+Object {
+  "logs": Array [
     "add ./fixtures/file.txt as fileDependencies",
     "begin globbing './fixtures/file.txt' with a context of './fixtures'",
-    "found ./fixtures/file.txt",
+    "determined './fixtures/file.txt' is a file",
     "determined that './fixtures/file.txt' should write to 'file.txt'",
+    "end to adding additional assets",
+    "found ./fixtures/file.txt",
+    "getting stats for './fixtures/file.txt' to determinate 'fromType'",
     "getting stats for './fixtures/file.txt' to write to assets",
+    "processing from: 'file.txt' to: '.'",
     "reading './fixtures/file.txt' to write to assets",
+    "start to adding additional assets",
     "writing 'file.txt' to compilation assets from './fixtures/file.txt'",
+  ],
+}
+`;
+
+exports[`CopyPlugin logging should logging when "from" is a glob: logs 1`] = `
+Object {
+  "logs": Array [
+    "add ./fixtures/directory as contextDependencies",
+    "add ./fixtures/directory/directoryfile.txt as fileDependencies",
+    "add ./fixtures/directory/nested/deep-nested/deepnested.txt as fileDependencies",
+    "add ./fixtures/directory/nested/nestedfile.txt as fileDependencies",
+    "begin globbing './fixtures/directory/**' with a context of './fixtures'",
+    "determined './fixtures/directory/**' is a glob",
+    "determined that './fixtures/directory/directoryfile.txt' should write to 'directory/directoryfile.txt'",
+    "determined that './fixtures/directory/nested' should write to 'directory/nested'",
+    "determined that './fixtures/directory/nested/deep-nested' should write to 'directory/nested/deep-nested'",
+    "determined that './fixtures/directory/nested/deep-nested/deepnested.txt' should write to 'directory/nested/deep-nested/deepnested.txt'",
+    "determined that './fixtures/directory/nested/nestedfile.txt' should write to 'directory/nested/nestedfile.txt'",
     "end to adding additional assets",
+    "found ./fixtures/directory/directoryfile.txt",
+    "found ./fixtures/directory/nested",
+    "found ./fixtures/directory/nested/deep-nested",
+    "found ./fixtures/directory/nested/deep-nested/deepnested.txt",
+    "found ./fixtures/directory/nested/nestedfile.txt",
+    "getting stats for './fixtures/directory/**' to determinate 'fromType'",
+    "getting stats for './fixtures/directory/directoryfile.txt' to write to assets",
+    "getting stats for './fixtures/directory/nested' to write to assets",
+    "getting stats for './fixtures/directory/nested/deep-nested' to write to assets",
+    "getting stats for './fixtures/directory/nested/deep-nested/deepnested.txt' to write to assets",
+    "getting stats for './fixtures/directory/nested/nestedfile.txt' to write to assets",
+    "processing from: 'directory/**' to: '.'",
+    "reading './fixtures/directory/directoryfile.txt' to write to assets",
+    "reading './fixtures/directory/nested/deep-nested/deepnested.txt' to write to assets",
+    "reading './fixtures/directory/nested/nestedfile.txt' to write to assets",
+    "skipping './fixtures/directory/nested' because it is empty directory",
+    "skipping './fixtures/directory/nested/deep-nested' because it is empty directory",
+    "start to adding additional assets",
+    "writing 'directory/directoryfile.txt' to compilation assets from './fixtures/directory/directoryfile.txt'",
+    "writing 'directory/nested/deep-nested/deepnested.txt' to compilation assets from './fixtures/directory/nested/deep-nested/deepnested.txt'",
+    "writing 'directory/nested/nestedfile.txt' to compilation assets from './fixtures/directory/nested/nestedfile.txt'",
   ],
 }
 `;
diff --git a/test/__snapshots__/validate-options.test.js.snap b/test/__snapshots__/validate-options.test.js.snap
@@ -127,50 +127,56 @@ exports[`validate options should throw an error on the "patterns" option with "t
    [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
+exports[`validate options should throw an error on the "patterns" option with "undefined" value 1`] = `
+"Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
+`;
+
 exports[`validate options should throw an error on the "unknown" option with "/test/" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "[]" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "{"foo":"bar"}" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "{}" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "1" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "false" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "test" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
 
 exports[`validate options should throw an error on the "unknown" option with "true" value 1`] = `
 "Invalid options object. Copy Plugin has been initialized using an options object that does not match the API schema.
- - options has an unknown property 'unknown'. These properties are valid:
-   object { patterns?, options? }"
+ - options misses the property 'patterns'. Should be:
+   [non-empty string | object { from, to?, context?, globOptions?, toType?, force?, flatten?, transform?, cacheTransform?, transformPath?, noErrorOnMissing? }, ...] (should not have fewer than 1 item)"
 `;
diff --git a/test/globOptions-option.test.js b/test/globOptions-option.test.js
diff --git a/test/to-option.test.js b/test/to-option.test.js
diff --git a/test/validate-options.test.js b/test/validate-options.test.js

Original file line number	Diff line number	Diff line change
`@@ -100,5 +100,6 @@`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`}`
`103`		`- }`
	`103`	`+ },`
	`104`	`+ "required": ["patterns"]`
`104`	`105`	`}`