Deps (#131)

* Update dev deps * Fix object assign to spread operators * Switch from toBeTruthy and toBeFalsy * Update tests so there are no dup names * Convert to toHaveLength * Convert to strict equals
tclindner · Sep 22, 2019 · 575656c · 575656c
1 parent 13a86b2
commit 575656c
Show file tree

Hide file tree

Showing 107 changed files with 329 additions and 397 deletions.
diff --git a/package.json b/package.json
@@ -50,10 +50,11 @@
     "strip-json-comments": "^3.0.1"
   },
   "devDependencies": {
-    "eslint": "^5.16.0",
-    "eslint-config-tc": "^6.5.0",
+    "eslint": "^6.4.0",
+    "eslint-config-tc": "^8.0.1",
     "eslint-formatter-pretty": "^2.1.1",
     "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-jest": "^22.17.0",
     "eslint-plugin-prettier": "^3.1.1",
     "figures": "^3.0.0",
     "jest": "^24.9.0",

diff --git a/src/config/applyExtendsIfSpecified.js b/src/config/applyExtendsIfSpecified.js
@@ -26,10 +26,10 @@ const applyExtends = (config, parentName, originalFilePath) => {
       const extendsConfig = loadFromModule(moduleName, originalFilePath);
 
       // Merge base object
-      const mergedConfig = Object.assign({}, extendsConfig, previousConfig);
+      const mergedConfig = {...extendsConfig, ...previousConfig};
 
       // Merge rules
-      const rules = Object.assign({}, extendsConfig.rules, previousConfig.rules);
+      const rules = {...extendsConfig.rules, ...previousConfig.rules};
 
       // Merge plugins, if exist
       const extendsConfigPlugins = Array.isArray(extendsConfig.plugins) ? extendsConfig.plugins : [];

diff --git a/src/config/applyOverrides.js b/src/config/applyOverrides.js
@@ -34,7 +34,7 @@ const applyOverrides = (cwd, filePath, rules, overrides) => {
         const globbedFilePath = path.resolve(cwd, globFile);
 
         if (filePath === globbedFilePath) {
-          finalRules = Object.assign({}, finalRules, override.rules);
+          finalRules = {...finalRules, ...override.rules};
         }
       });
     });

diff --git a/test/unit/NpmPackageJsonLint.test.js b/test/unit/NpmPackageJsonLint.test.js
@@ -16,16 +16,16 @@ describe('NpmPackageJsonLint Unit Tests', () => {
         const expectedTotalWarningCount = 0;
         const expectedIssues = 0;
 
-        expect(response.results.length).toStrictEqual(expectedResults);
+        expect(response.results).toHaveLength(expectedResults);
         expect(response.ignoreCount).toStrictEqual(expectedTotalIgnoreCount);
         expect(response.errorCount).toStrictEqual(expectedTotalErrorCount);
         expect(response.warningCount).toStrictEqual(expectedTotalWarningCount);
-        expect(response.results[0].issues.length).toStrictEqual(expectedIssues);
+        expect(response.results[0].issues).toHaveLength(expectedIssues);
       });
     });
 
-    describe('validate that errors and warnings are set', () => {
-      test('one error and one warning expected', () => {
+    describe('validate that errors and warnings are set on output', () => {
+      test('ten errors and one warning expected', () => {
         const packageJsonData = {
           name: 'ALLCAPS'
         };
@@ -43,17 +43,13 @@ describe('NpmPackageJsonLint Unit Tests', () => {
         const expectedErrorCount = 9;
         const expectedWarningCount = 1;
 
-        expect(response.results.length).toStrictEqual(expectedResults);
+        expect(response.results).toHaveLength(expectedResults);
         expect(response.ignoreCount).toStrictEqual(expectedTotalIgnoreCount);
         expect(response.errorCount).toStrictEqual(expectedTotalErrorCount);
         expect(response.warningCount).toStrictEqual(expectedTotalWarningCount);
-        expect(response.results[0].issues.length).toStrictEqual(expectedIssues);
-        expect(response.results[0].issues.filter(issue => issue.severity === 'error').length).toStrictEqual(
-          expectedErrorCount
-        );
-        expect(response.results[0].issues.filter(issue => issue.severity === 'warning').length).toStrictEqual(
-          expectedWarningCount
-        );
+        expect(response.results[0].issues).toHaveLength(expectedIssues);
+        expect(response.results[0].issues.filter(issue => issue.severity === 'error')).toHaveLength(expectedErrorCount);
+        expect(response.results[0].issues.filter(issue => issue.severity === 'warning')).toHaveLength(expectedWarningCount);
       });
     });
 
@@ -105,17 +101,13 @@ describe('NpmPackageJsonLint Unit Tests', () => {
         const expectedErrorCount = 9;
         const expectedWarningCount = 0;
 
-        expect(response.results.length).toStrictEqual(expectedResults);
+        expect(response.results).toHaveLength(expectedResults);
         expect(response.ignoreCount).toStrictEqual(expectedTotalIgnoreCount);
         expect(response.errorCount).toStrictEqual(expectedTotalErrorCount);
         expect(response.warningCount).toStrictEqual(expectedTotalWarningCount);
-        expect(response.results[0].issues.length).toStrictEqual(expectedIssues);
-        expect(response.results[0].issues.filter(issue => issue.severity === 'error').length).toStrictEqual(
-          expectedErrorCount
-        );
-        expect(response.results[0].issues.filter(issue => issue.severity === 'warning').length).toStrictEqual(
-          expectedWarningCount
-        );
+        expect(response.results[0].issues).toHaveLength(expectedIssues);
+        expect(response.results[0].issues.filter(issue => issue.severity === 'error')).toHaveLength(expectedErrorCount);
+        expect(response.results[0].issues.filter(issue => issue.severity === 'warning')).toHaveLength(expectedWarningCount);
       });
     });
 
@@ -149,7 +141,7 @@ describe('NpmPackageJsonLint Unit Tests', () => {
         const expectedTotalErrorCount = 0;
         const expectedTotalWarningCount = 0;
 
-        expect(response.results.length).toStrictEqual(expectedResults);
+        expect(response.results).toHaveLength(expectedResults);
         expect(response.ignoreCount).toStrictEqual(expectedTotalIgnoreCount);
         expect(response.errorCount).toStrictEqual(expectedTotalErrorCount);
         expect(response.warningCount).toStrictEqual(expectedTotalWarningCount);

diff --git a/test/unit/Parser.test.js b/test/unit/Parser.test.js
@@ -25,33 +25,8 @@ describe('Parser Unit Tests', () => {
 
         expect(() => {
           Parser.parseJsonFile('missing.json');
-        }).toThrowError('Failed to read config file: missing.json. \nError: Error');
+        }).toThrow('Failed to read config file: missing.json. \nError: Error');
       });
     });
   });
-
-  // describe('parseJavaScriptFile method', () => {
-  //   describe('when file is present', () => {
-  //     test('an object should be returned', () => {
-  //       const packageJson = {
-  //         name: 'Marcel the Shell with Shoes On'
-  //       };
-  //       const stub = sinon.stub(fs, 'readFileSync').returns(packageJson);
-
-  //       Parser.parseJavaScriptFile('package.json').should.equal(packageJson);
-  //       fs.readFileSync.restore();
-  //     });
-  //   });
-
-  //   describe('when file is not present', () => {
-  //     test('an error should be thrown', () => {
-  //       const stub = sinon.stub(fs, 'readFileSync').throws();
-
-  //       (() => {
-  //         Parser.parseJavaScriptFile('missing.json');
-  //       }).should.throw('Failed to read config file: missing.json. \nError: Error');
-  //       fs.readFileSync.restore();
-  //     });
-  //   });
-  // });
 });
diff --git a/test/unit/Reporter.test.js b/test/unit/Reporter.test.js
@@ -196,7 +196,7 @@ describe('Reporter Unit Tests', () => {
         consoleMock.mockRestore();
       });
 
-      test('and two errors, two warnings exist, and quiet is false. Spy should be 8', () => {
+      test('and zero errors, zero warnings exist, and ignore is true. Spy should be 2', () => {
         const results = {
           results: [
             {

diff --git a/test/unit/config/applyExtendsIfSpecified.test.js b/test/unit/config/applyExtendsIfSpecified.test.js
@@ -70,7 +70,7 @@ describe('applyExtendsIfSpecified Unit Tests', () => {
 
     expect(() => {
       applyExtendsIfSpecified(passedConfig, filePath);
-    }).toThrow();
+    }).toThrow('');
   });
 
   test('when file has local extends (invalid extension type), a config object is returned', () => {
@@ -84,7 +84,7 @@ describe('applyExtendsIfSpecified Unit Tests', () => {
 
     expect(() => {
       applyExtendsIfSpecified(passedConfig, filePath);
-    }).toThrow();
+    }).toThrow('');
   });
 
   test('when file has module extends (valid), a config object is returned', () => {
@@ -145,6 +145,6 @@ describe('applyExtendsIfSpecified Unit Tests', () => {
 
     expect(() => {
       applyExtendsIfSpecified(passedConfig, filePath);
-    }).toThrow();
+    }).toThrow('');
   });
 });
diff --git a/test/unit/config/cosmicConfigTransformer.test.js b/test/unit/config/cosmicConfigTransformer.test.js
@@ -20,7 +20,7 @@ describe('cosmicConfigTransformer Unit Tests', () => {
       });
     });
 
-    describe('valid cosmiconfigResult - no configBaseDirectory', () => {
+    describe('valid cosmiconfigResult - configBaseDirectory', () => {
       test('null should be returned', () => {
         path.dirname.mockReturnValue('./myConfig');
         applyExtendsIfSpecified.mockReturnValue({