test(core): improve branch coverage

JamieMason · Aug 23, 2020 · bfed243 · bfed243
1 parent 34eceaf
commit bfed243
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 10 deletions.
diff --git a/src/commands/__snapshots__/fix-mismatches.spec.ts.snap b/src/commands/__snapshots__/fix-mismatches.spec.ts.snap
@@ -1,5 +1,26 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`fixMismatches ignores non-semver dependencies 1`] = `
+Array [
+  Object {
+    "contents": Object {
+      "dependencies": Object {
+        "foo": "link:vendor/foo-0.1.0",
+      },
+    },
+    "filePath": "/a/package.json",
+  },
+  Object {
+    "contents": Object {
+      "dependencies": Object {
+        "foo": "link:vendor/foo-0.2.0",
+      },
+    },
+    "filePath": "/b/package.json",
+  },
+]
+`;
+
 exports[`fixMismatches sets all dependencies installed with different versions to the highest version 1`] = `
 Array [
   Object {
@@ -12,7 +33,7 @@ Array [
   },
   Object {
     "contents": Object {
-      "dependencies": Object {
+      "devDependencies": Object {
         "foo": "0.2.0",
       },
     },

diff --git a/src/commands/fix-mismatches.spec.ts b/src/commands/fix-mismatches.spec.ts
@@ -14,8 +14,17 @@ describe('fixMismatches', () => {
   });
 
   it('sets all dependencies installed with different versions to the highest version', () => {
-    const wrappers = [mock.wrapper('a', ['foo@0.1.0']), mock.wrapper('b', ['foo@0.2.0'])];
-    fixMismatches(['dependencies'], /./, wrappers);
+    const wrappers = [mock.wrapper('a', ['foo@0.1.0']), mock.wrapper('b', [], ['foo@0.2.0'])];
+    fixMismatches(['dependencies', 'devDependencies', 'peerDependencies'], /./, wrappers);
+    expect(wrappers).toMatchSnapshot();
+  });
+
+  it('ignores non-semver dependencies', () => {
+    const wrappers = [
+      mock.wrapper('a', ['foo@link:vendor/foo-0.1.0']),
+      mock.wrapper('b', ['foo@link:vendor/foo-0.2.0']),
+    ];
+    fixMismatches(['dependencies', 'devDependencies', 'peerDependencies'], /./, wrappers);
     expect(wrappers).toMatchSnapshot();
   });
 });
diff --git a/src/commands/format.spec.ts b/src/commands/format.spec.ts
@@ -1,6 +1,6 @@
+import { DEFAULT_CONFIG } from '../constants';
 import { format } from './format';
 import { Source, SourceWrapper } from './lib/get-wrappers';
-import { DEFAULT_CONFIG } from '../constants';
 
 const createWrapper = (contents: Source): SourceWrapper => ({ contents, filePath: '' });
 

diff --git a/src/commands/lib/get-wrappers.ts b/src/commands/lib/get-wrappers.ts
@@ -1,8 +1,8 @@
-import { sync as readYamlFileSync } from 'read-yaml-file';
 import { isArrayOfStrings } from 'expect-more';
 import { readJsonSync } from 'fs-extra';
 import { sync } from 'glob';
 import { join, resolve } from 'path';
+import { sync as readYamlFileSync } from 'read-yaml-file';
 import { ALL_PATTERNS } from '../../constants';
 
 interface Options {

diff --git a/src/lib/get-config.ts b/src/lib/get-config.ts
@@ -1,5 +1,5 @@
 import { cosmiconfigSync } from 'cosmiconfig';
-import { isArray, isBoolean, isNonEmptyString, isObject, isRegExp, isArrayOfStrings } from 'expect-more';
+import { isArray, isArrayOfStrings, isBoolean, isNonEmptyString, isObject, isRegExp } from 'expect-more';
 import { isValidSemverRange } from '../commands/lib/is-semver';
 import { DEFAULT_CONFIG, SyncpackConfig } from '../constants';
 

diff --git a/test/mock.ts b/test/mock.ts
@@ -7,12 +7,12 @@ const toObject = (identifiers: string[]): { [key: string]: string } =>
     return memo;
   }, {});
 
-export const wrapper = (dirName: string, deps: string[], devDeps?: string[], peerDeps?: string[]): SourceWrapper => {
+export const wrapper = (dirName: string, deps?: string[], devDeps?: string[], peerDeps?: string[]): SourceWrapper => {
   return {
     contents: {
-      ...(deps ? { dependencies: toObject(deps) } : {}),
-      ...(devDeps ? { devDependencies: toObject(devDeps) } : {}),
-      ...(peerDeps ? { peerDependencies: toObject(peerDeps) } : {}),
+      ...(deps && deps.length > 0 ? { dependencies: toObject(deps) } : {}),
+      ...(devDeps && devDeps.length > 0 ? { devDependencies: toObject(devDeps) } : {}),
+      ...(peerDeps && peerDeps.length > 0 ? { peerDependencies: toObject(peerDeps) } : {}),
     },
     filePath: `/${dirName}/package.json`,
   };