tests: minor deduplication

Author: XhmikosR

test/config.test.js

@@ -5,26 +5,21 @@ import dependencyTree from '../index.js';
 import { fixtures } from './helpers.js';
 
 describe('Config', () => {
-  it('pre-parses tsconfig for performance', () => {
+  describe('with a tsConfig path', () => {
     const tsConfigPath = fixtures('ts', '.tsconfig');
     const config = new Config({
       filename: 'foo',
       directory: 'bar',
       tsConfig: tsConfigPath
     });
 
-    expect(config.tsConfig).toBeTypeOf('object');
-  });
-
-  it('includes tsConfigPath so filing-cabinet can resolve compilerOptions.paths', () => {
-    const tsConfigPath = fixtures('ts', '.tsconfig');
-    const config = new Config({
-      filename: 'foo',
-      directory: 'bar',
-      tsConfig: tsConfigPath
+    it('pre-parses tsconfig for performance', () => {
+      expect(config.tsConfig).toBeTypeOf('object');
     });
 
-    expect(config.tsConfigPath).toBe(tsConfigPath);
+    it('includes tsConfigPath so filing-cabinet can resolve compilerOptions.paths', () => {
+      expect(config.tsConfigPath).toBe(tsConfigPath);
+    });
   });
 
   it('retains detective config in the clone', () => {

test/formats.test.js

@@ -216,25 +216,28 @@ describe('module formats', () => {
       expect(results).toHaveLength(2);
     });
 
-    it('recognizes ts file import from js file when allowJs is on (#104)', () => {
+    describe('mixedTsJs', () => {
       const directory = fixtures('ts', 'mixedTsJs');
-      const filename = path.join(directory, 'a.js');
-      const tsConfigPath = path.join(directory, '.tsconfig');
 
-      const options = {
-        filename,
-        directory,
-        tsConfig: tsConfigPath
-      };
-      const parsedTsConfig = new Config(options).tsConfig;
+      it('recognizes ts file import from js file when allowJs is on (#104)', () => {
+        const filename = path.join(directory, 'a.js');
+        const tsConfigPath = path.join(directory, '.tsconfig');
 
-      expect(parsedTsConfig.compilerOptions.allowJs).toBe(true);
+        const options = {
+          filename,
+          directory,
+          tsConfig: tsConfigPath
+        };
+        const parsedTsConfig = new Config(options).tsConfig;
 
-      const results = dependencyTree.toList(options);
+        expect(parsedTsConfig.compilerOptions.allowJs).toBe(true);
 
-      const depB = path.join(directory, 'b.ts');
+        const results = dependencyTree.toList(options);
 
-      expect(results[0]).toBe(depB);
+        const depB = path.join(directory, 'b.ts');
+
+        expect(results[0]).toBe(depB);
+      });
     });
   });
 });

test/index.test.js

@@ -250,10 +250,10 @@ describe('dependencyTree', () => {
     });
 
     it('does not throw on the legacy `root` option', () => {
-      expect(() => {
-        const directory = fixtures('onlyRealDeps');
-        const filename = path.normalize(`${directory}/a.js`);
+      const directory = fixtures('onlyRealDeps');
+      const filename = path.normalize(`${directory}/a.js`);
 
+      expect(() => {
         dependencyTree({ filename, root: directory });
       }).not.toThrow();
     });
@@ -287,9 +287,10 @@ describe('dependencyTree', () => {
   });
 
   describe('memoization (#2)', () => {
+    const directory = fixtures('amd');
+    const filename = path.join(directory, 'a.js');
+
     it('accepts a cache object for memoization (#2)', () => {
-      const directory = fixtures('amd');
-      const filename = path.join(directory, 'a.js');
       const bFile = path.join(directory, 'b.js');
       const cFile = path.join(directory, 'c.js');
       const cache = {
@@ -307,9 +308,6 @@ describe('dependencyTree', () => {
     });
 
     it('returns the precomputed list of a cached entry point', () => {
-      const directory = fixtures('amd');
-      const filename = path.join(directory, 'a.js');
-
       const cache = {
         [filename]: [] // Shouldn't process the first file's tree
       };

test/node-modules.test.js

@@ -4,30 +4,32 @@ import dependencyTree from '../index.js';
 import { fixtures } from './helpers.js';
 
 describe('package-specific node_modules resolution', () => {
-  const directory = fixtures('es6', 'parentChild');
-  const filename = path.normalize(`${directory}/module.entry.js`);
-  const rootChildPath = path.normalize(`${directory}/node_modules/child_node_module/index.main.js`);
-  const nestedChildPath = path.normalize(`${directory}/node_modules/parent_module_a/node_modules/child_node_module/index.main.js`);
-
-  it('finds sub package in node module package', () => {
-    const treeList = dependencyTree({
-      filename,
-      directory,
-      isListForm: true
+  describe('with a nested parent/child package layout', () => {
+    const directory = fixtures('es6', 'parentChild');
+    const filename = path.normalize(`${directory}/module.entry.js`);
+    const rootChildPath = path.normalize(`${directory}/node_modules/child_node_module/index.main.js`);
+    const nestedChildPath = path.normalize(`${directory}/node_modules/parent_module_a/node_modules/child_node_module/index.main.js`);
+
+    it('finds sub package in node module package', () => {
+      const treeList = dependencyTree({
+        filename,
+        directory,
+        isListForm: true
+      });
+
+      expect(treeList).toContain(nestedChildPath);
     });
 
-    expect(treeList).toContain(nestedChildPath);
-  });
+    it('uses correct version of sub package in node module package', () => {
+      const treeList = dependencyTree({
+        filename,
+        directory,
+        isListForm: true
+      });
 
-  it('uses correct version of sub package in node module package', () => {
-    const treeList = dependencyTree({
-      filename,
-      directory,
-      isListForm: true
+      expect(treeList).not.toContain(rootChildPath);
+      expect(treeList).toContain(nestedChildPath);
     });
-
-    expect(treeList).not.toContain(rootChildPath);
-    expect(treeList).toContain(nestedChildPath);
   });
 
   it('falls back to entry directory when a node_modules file has no package subpath', () => {