refactor: tests (#421)

webpack-contrib · Dec 9, 2019 · c936416 · c936416
1 parent 08a4d7f
commit c936416
Show file tree

Hide file tree

Showing 38 changed files with 76 additions and 76 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,7 +8,7 @@ npm-debug.log*
 /local
 /reports
 /node_modules
-/test/helpers/\[special\?directory\]
+/test/fixtures/\[special\?directory\]
 
 .DS_Store
 Thumbs.db

diff --git a/globalSetup.js b/globalSetup.js
@@ -4,9 +4,9 @@ const fs = require('fs');
 // eslint-disable-next-line import/no-extraneous-dependencies
 const mkdirp = require('mkdirp');
 
-const removeIllegalCharacterForWindows = require('./test/utils/removeIllegalCharacterForWindows');
+const removeIllegalCharacterForWindows = require('./test/helpers/removeIllegalCharacterForWindows');
 
-const baseDir = path.resolve(__dirname, 'test/helpers');
+const baseDir = path.resolve(__dirname, 'test/fixtures');
 
 const specialFiles = {
   '[special?directory]/nested/nestedfile.txt': '',

diff --git a/test/CopyPlugin.test.js b/test/CopyPlugin.test.js
@@ -1,10 +1,10 @@
 import path from 'path';
 
-import { MockCompiler } from './utils/mocks';
-import { run, runEmit, runChange } from './utils/run';
+import { MockCompiler } from './helpers/mocks';
+import { run, runEmit, runChange } from './helpers/run';
 
 const BUILD_DIR = path.join(__dirname, 'build');
-const HELPER_DIR = path.join(__dirname, 'helpers');
+const FIXTURES_DIR = path.join(__dirname, 'fixtures');
 
 describe('apply function', () => {
   describe('basic', () => {
@@ -393,7 +393,7 @@ describe('apply function', () => {
         ],
       })
         .then((compilation) => {
-          const absFrom = path.join(HELPER_DIR, 'file.txt');
+          const absFrom = path.join(FIXTURES_DIR, 'file.txt');
 
           expect(Array.from(compilation.fileDependencies).sort()).toEqual(
             [absFrom].sort()
@@ -412,7 +412,7 @@ describe('apply function', () => {
         ],
       })
         .then((compilation) => {
-          const absFrom = path.join(HELPER_DIR, 'directory');
+          const absFrom = path.join(FIXTURES_DIR, 'directory');
 
           expect(Array.from(compilation.contextDependencies).sort()).toEqual(
             [absFrom].sort()
@@ -435,7 +435,7 @@ describe('apply function', () => {
             Array.from(compilation.contextDependencies)
               .map((contextDependency) => contextDependency)
               .sort()
-          ).toEqual([path.join(HELPER_DIR, 'directory')].sort());
+          ).toEqual([path.join(FIXTURES_DIR, 'directory')].sort());
         })
         .then(done)
         .catch(done);
@@ -452,7 +452,7 @@ describe('apply function', () => {
         ],
       })
         .then((compilation) => {
-          const absFrom = path.join(HELPER_DIR, 'directory');
+          const absFrom = path.join(FIXTURES_DIR, 'directory');
 
           expect(compilation.contextDependencies).not.toContain(absFrom);
         })
@@ -463,8 +463,8 @@ describe('apply function', () => {
     it('only include files that have changed', (done) => {
       runChange({
         expectedAssetKeys: ['tempfile1.txt'],
-        newFileLoc1: path.join(HELPER_DIR, 'watch', 'tempfile1.txt'),
-        newFileLoc2: path.join(HELPER_DIR, 'watch', 'tempfile2.txt'),
+        newFileLoc1: path.join(FIXTURES_DIR, 'watch', 'tempfile1.txt'),
+        newFileLoc2: path.join(FIXTURES_DIR, 'watch', 'tempfile2.txt'),
         patterns: [
           {
             from: 'tempfile1.txt',
@@ -482,13 +482,13 @@ describe('apply function', () => {
       runChange({
         expectedAssetKeys: ['tempfile1.txt'],
         newFileLoc1: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile1.txt'
         ),
         newFileLoc2: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile2.txt'
@@ -507,13 +507,13 @@ describe('apply function', () => {
       runChange({
         expectedAssetKeys: ['tempfile1.txt', 'tempfile2.txt', '.gitkeep'],
         newFileLoc1: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile1.txt'
         ),
         newFileLoc2: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile2.txt'
@@ -535,13 +535,13 @@ describe('apply function', () => {
       runChange({
         expectedAssetKeys: ['dest1/tempfile1.txt'],
         newFileLoc1: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile1.txt'
         ),
         newFileLoc2: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile2.txt'
@@ -562,13 +562,13 @@ describe('apply function', () => {
       runChange({
         expectedAssetKeys: ['dest1/tempfile1.txt', 'dest2/tempfile1.txt'],
         newFileLoc1: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile1.txt'
         ),
         newFileLoc2: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile2.txt'
@@ -597,12 +597,12 @@ describe('apply function', () => {
           'dest2/directory/tempfile1.txt',
         ],
         newFileLoc1: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile1.txt'
         ),
-        newFileLoc2: path.join(HELPER_DIR, 'watch', 'tempfile2.txt'),
+        newFileLoc2: path.join(FIXTURES_DIR, 'watch', 'tempfile2.txt'),
         patterns: [
           {
             context: 'directory',
@@ -626,12 +626,12 @@ describe('apply function', () => {
           'dest2/tempfile1.txt',
         ],
         newFileLoc1: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile1.txt'
         ),
-        newFileLoc2: path.join(HELPER_DIR, 'watch', 'tempfile2.txt'),
+        newFileLoc2: path.join(FIXTURES_DIR, 'watch', 'tempfile2.txt'),
         patterns: [
           {
             from: '**/*.txt',
@@ -651,9 +651,9 @@ describe('apply function', () => {
     it('copy only changed files (multiple patterns with difference context 2)', (done) => {
       runChange({
         expectedAssetKeys: ['dest1/tempfile1.txt'],
-        newFileLoc1: path.join(HELPER_DIR, 'watch', 'tempfile1.txt'),
+        newFileLoc1: path.join(FIXTURES_DIR, 'watch', 'tempfile1.txt'),
         newFileLoc2: path.join(
-          HELPER_DIR,
+          FIXTURES_DIR,
           'watch',
           'directory',
           'tempfile2.txt'

diff --git a/test/cache-option.test.js b/test/cache-option.test.js
@@ -6,9 +6,9 @@ import cacache from 'cacache';
 import findCacheDir from 'find-cache-dir';
 import isGzip from 'is-gzip';
 
-import { runEmit } from './utils/run';
+import { runEmit } from './helpers/run';
 
-const HELPER_DIR = path.join(__dirname, 'helpers');
+const FIXTURES_DIR = path.join(__dirname, 'fixtures');
 
 describe('cache option', () => {
   const cacheDir = findCacheDir({ name: 'copy-webpack-plugin' });
@@ -184,7 +184,7 @@ describe('cache option', () => {
 
   it('should cache binary file', (done) => {
     const from = 'file.txt.gz';
-    const content = fs.readFileSync(path.join(HELPER_DIR, from));
+    const content = fs.readFileSync(path.join(FIXTURES_DIR, from));
     const expectedNewContent = zlib.gzipSync('newchanged!');
 
     expect(isGzip(content)).toBe(true);

diff --git a/test/context-option.test.js b/test/context-option.test.js
@@ -1,8 +1,8 @@
 import path from 'path';
 
-import { runEmit } from './utils/run';
+import { runEmit } from './helpers/run';
 
-const HELPER_DIR = path.join(__dirname, 'helpers');
+const FIXTURES_DIR = path.join(__dirname, 'fixtures');
 
 describe('context option', () => {
   it('should work when "from" is a file', (done) => {
@@ -74,7 +74,7 @@ describe('context option', () => {
       ],
       patterns: [
         {
-          // Todo strange behavour when you use `HELPER_DIR`, need investigate for next major release
+          // Todo strange behavour when you use `FIXTURES_DIR`, need investigate for next major release
           from: '.',
           context: '[special?directory]',
         },
@@ -129,7 +129,7 @@ describe('context option', () => {
       ],
       patterns: [
         {
-          context: path.join(HELPER_DIR, 'directory'),
+          context: path.join(FIXTURES_DIR, 'directory'),
           from: '**/*',
           to: 'nested',
         },
@@ -177,7 +177,7 @@ describe('context option', () => {
       patterns: [
         {
           from: 'directoryfile.txt',
-          context: path.join(HELPER_DIR, 'directory'),
+          context: path.join(FIXTURES_DIR, 'directory'),
         },
       ],
     })
@@ -192,7 +192,7 @@ describe('context option', () => {
         'newdirectory/nestedfile.txt',
       ],
       options: {
-        context: path.join(HELPER_DIR, 'directory'),
+        context: path.join(FIXTURES_DIR, 'directory'),
       },
       patterns: [
         {
@@ -254,7 +254,7 @@ describe('context option', () => {
         'newdirectory/nesteddir/nestedfile.txt',
       ],
       options: {
-        context: path.join(HELPER_DIR, 'dir (86)'),
+        context: path.join(FIXTURES_DIR, 'dir (86)'),
       },
       patterns: [
         {

diff --git a/test/helpers/.file.txt → test/fixtures/.file.txt b/test/helpers/.file.txt → test/fixtures/.file.txt
diff --git a/test/helpers/[!]/hello.txt → test/fixtures/[!]/hello.txt b/test/helpers/[!]/hello.txt → test/fixtures/[!]/hello.txt
diff --git a/test/helpers/binextension.bin → test/fixtures/binextension.bin b/test/helpers/binextension.bin → test/fixtures/binextension.bin
diff --git a/test/helpers/dir (86)/file.txt → test/fixtures/dir (86)/file.txt b/test/helpers/dir (86)/file.txt → test/fixtures/dir (86)/file.txt
diff --git a/...nesteddir/deepnesteddir/deepnesteddir.txt → ...nesteddir/deepnesteddir/deepnesteddir.txt b/...nesteddir/deepnesteddir/deepnesteddir.txt → ...nesteddir/deepnesteddir/deepnesteddir.txt
diff --git a/...helpers/dir (86)/nesteddir/nestedfile.txt → ...ixtures/dir (86)/nesteddir/nestedfile.txt b/...helpers/dir (86)/nesteddir/nestedfile.txt → ...ixtures/dir (86)/nesteddir/nestedfile.txt
diff --git a/test/helpers/directory/.dottedfile → test/fixtures/directory/.dottedfile b/test/helpers/directory/.dottedfile → test/fixtures/directory/.dottedfile
diff --git a/test/helpers/directory/directoryfile.txt → test/fixtures/directory/directoryfile.txt b/test/helpers/directory/directoryfile.txt → test/fixtures/directory/directoryfile.txt
diff --git a/...rectory/nested/deep-nested/deepnested.txt → ...rectory/nested/deep-nested/deepnested.txt b/...rectory/nested/deep-nested/deepnested.txt → ...rectory/nested/deep-nested/deepnested.txt
diff --git a/test/helpers/directory/nested/nestedfile.txt → .../fixtures/directory/nested/nestedfile.txt b/test/helpers/directory/nested/nestedfile.txt → .../fixtures/directory/nested/nestedfile.txt
diff --git a/test/helpers/file.txt → test/fixtures/file.txt b/test/helpers/file.txt → test/fixtures/file.txt
diff --git a/test/helpers/file.txt.gz → test/fixtures/file.txt.gz b/test/helpers/file.txt.gz → test/fixtures/file.txt.gz
diff --git a/test/helpers/noextension → test/fixtures/noextension b/test/helpers/noextension → test/fixtures/noextension
diff --git a/test/helpers/symlink/directory-ln → test/fixtures/symlink/directory-ln b/test/helpers/symlink/directory-ln → test/fixtures/symlink/directory-ln
diff --git a/test/helpers/symlink/directory/file.txt → test/fixtures/symlink/directory/file.txt b/test/helpers/symlink/directory/file.txt → test/fixtures/symlink/directory/file.txt
diff --git a/...ed-directory/file-in-nested-directory.txt → ...ed-directory/file-in-nested-directory.txt b/...ed-directory/file-in-nested-directory.txt → ...ed-directory/file-in-nested-directory.txt
diff --git a/test/helpers/symlink/file-ln.txt → test/fixtures/symlink/file-ln.txt b/test/helpers/symlink/file-ln.txt → test/fixtures/symlink/file-ln.txt
diff --git a/test/helpers/symlink/file.txt → test/fixtures/symlink/file.txt b/test/helpers/symlink/file.txt → test/fixtures/symlink/file.txt
diff --git a/test/helpers/watch/.gitkeep → test/fixtures/watch/.gitkeep b/test/helpers/watch/.gitkeep → test/fixtures/watch/.gitkeep
diff --git a/test/helpers/watch/directory/.gitkeep → test/fixtures/watch/directory/.gitkeep b/test/helpers/watch/directory/.gitkeep → test/fixtures/watch/directory/.gitkeep
diff --git a/test/flatten-option.test.js b/test/flatten-option.test.js
@@ -1,4 +1,4 @@
-import { runEmit } from './utils/run';
+import { runEmit } from './helpers/run';
 
 describe('flatten option', () => {
   it('should flatten a directory\'s files to a root directory when "from" is a file', (done) => {

diff --git a/test/force-option.test.js b/test/force-option.test.js
@@ -1,4 +1,4 @@
-import { runForce } from './utils/run';
+import { runForce } from './helpers/run';
 
 describe('force option', () => {
   describe('is not specified', () => {

diff --git a/test/from-option.test.js b/test/from-option.test.js
@@ -1,8 +1,8 @@
 import path from 'path';
 
-import { runEmit } from './utils/run';
+import { runEmit } from './helpers/run';
 
-const HELPER_DIR = path.join(__dirname, 'helpers');
+const FIXTURES_DIR = path.join(__dirname, 'fixtures');
 
 describe('from option', () => {
   describe('is a file', () => {
@@ -24,7 +24,7 @@ describe('from option', () => {
         expectedAssetKeys: ['file.txt'],
         patterns: [
           {
-            from: path.join(HELPER_DIR, 'file.txt'),
+            from: path.join(FIXTURES_DIR, 'file.txt'),
           },
         ],
       })
@@ -50,7 +50,7 @@ describe('from option', () => {
         expectedAssetKeys: ['directoryfile.txt'],
         patterns: [
           {
-            from: path.join(HELPER_DIR, 'directory/directoryfile.txt'),
+            from: path.join(FIXTURES_DIR, 'directory/directoryfile.txt'),
           },
         ],
       })
@@ -77,7 +77,7 @@ describe('from option', () => {
         expectedAssetKeys: [],
         expectedWarnings: [
           new Error(
-            `unable to locate 'nonexistent.txt' at '${HELPER_DIR}${path.sep}nonexistent.txt'`
+            `unable to locate 'nonexistent.txt' at '${FIXTURES_DIR}${path.sep}nonexistent.txt'`
           ),
         ],
         patterns: [
@@ -162,7 +162,7 @@ describe('from option', () => {
         ],
         patterns: [
           {
-            from: '../helpers',
+            from: '../fixtures',
           },
         ],
       })
@@ -216,7 +216,7 @@ describe('from option', () => {
         ],
         patterns: [
           {
-            from: path.join(HELPER_DIR, 'directory'),
+            from: path.join(FIXTURES_DIR, 'directory'),
           },
         ],
       })
@@ -260,7 +260,7 @@ describe('from option', () => {
         expectedAssetKeys: ['deep-nested/deepnested.txt', 'nestedfile.txt'],
         patterns: [
           {
-            from: path.join(HELPER_DIR, 'directory/nested'),
+            from: path.join(FIXTURES_DIR, 'directory/nested'),
           },
         ],
       })
@@ -273,7 +273,7 @@ describe('from option', () => {
         expectedAssetKeys: [],
         expectedWarnings: [
           new Error(
-            `unable to locate 'nonexistent' at '${HELPER_DIR}${path.sep}nonexistent'`
+            `unable to locate 'nonexistent' at '${FIXTURES_DIR}${path.sep}nonexistent'`
           ),
         ],
         patterns: [
@@ -306,7 +306,7 @@ describe('from option', () => {
         expectedAssetKeys: ['file.txt'],
         patterns: [
           {
-            from: path.join(HELPER_DIR, '*.txt'),
+            from: path.join(FIXTURES_DIR, '*.txt'),
           },
         ],
       })
@@ -359,7 +359,7 @@ describe('from option', () => {
         ],
         patterns: [
           {
-            from: path.join(HELPER_DIR, '**/*.txt'),
+            from: path.join(FIXTURES_DIR, '**/*.txt'),
           },
         ],
       })

diff --git a/test/globOptions-option.test.js b/test/globOptions-option.test.js
@@ -1,4 +1,4 @@
-import { runEmit } from './utils/run';
+import { runEmit } from './helpers/run';
 
 describe('from option', () => {
   it('should move files exclude dot files', (done) => {

diff --git a/test/utils/mocks.js → test/helpers/mocks.js b/test/utils/mocks.js → test/helpers/mocks.js
@@ -4,12 +4,12 @@ import CachedInputFileSystem from 'enhanced-resolve/lib/CachedInputFileSystem';
 import NodeJsInputFileSystem from 'enhanced-resolve/lib/NodeJsInputFileSystem';
 
 const BUILD_DIR = path.join(__dirname, '../build');
-const HELPER_DIR = path.join(__dirname, '../helpers');
+const FIXTURES_DIR = path.join(__dirname, '../fixtures');
 
 class MockCompiler {
   constructor(options = {}) {
     this.options = {
-      context: HELPER_DIR,
+      context: FIXTURES_DIR,
       output: {
         path: options.outputPath || BUILD_DIR,
       },

diff --git a/...utils/removeIllegalCharacterForWindows.js → ...lpers/removeIllegalCharacterForWindows.js b/...utils/removeIllegalCharacterForWindows.js → ...lpers/removeIllegalCharacterForWindows.js
diff --git a/test/utils/run.js → test/helpers/run.js b/test/utils/run.js → test/helpers/run.js
diff --git a/test/ignore-option.test.js b/test/ignore-option.test.js
@@ -1,4 +1,4 @@
-import { runEmit } from './utils/run';
+import { runEmit } from './helpers/run';
 
 describe('ignore option', () => {
   it('should ignore files when "from" is a file', (done) => {