Merge pull request #1297 from snyk/fix/protect-shouldnt-fail-when-the…

…res-nothing-to-do

fix: protect will not fail when there are not vulns to patch

src/cli/commands/protect/index.ts

@@ -98,7 +98,7 @@ async function patch(options: types.PolicyOptions & types.Options) {
     analytics.add('success', true);
     return 'Successfully applied Snyk patches';
   } catch (e) {
-    if (e.code === 'ALREADY_PATCHED') {
+    if (e.strCode === 'ALREADY_PATCHED') {
       analytics.add('success', true);
       return e.message + ', nothing to do';
     }

test/acceptance/cli-protect-no-vulns-to-patch.test.ts

@@ -0,0 +1,22 @@
+import { test } from 'tap';
+import * as cli from '../../src/cli/commands';
+import * as sinon from 'sinon';
+import * as snyk from '../../src/lib';
+
+test('`protect` with no vulns to patch', async (t) => {
+  t.plan(1);
+  const vulns = require('./fixtures/npm-package/test-graph-result.json');
+  vulns.vulnerabilities = undefined;
+  const testStub = sinon.stub(snyk, 'test').returns(vulns);
+
+  try {
+    const result = await cli.protect();
+    t.match(result, 'Code is already patched, nothing to do');
+  } catch (err) {
+    t.fail('should not fail');
+  } finally {
+    testStub.restore();
+  }
+
+  t.end();
+});

test/acceptance/cli-protect.test.ts

@@ -165,6 +165,7 @@ test('`protect` with no policy', async (t) => {
   const req = server.popRequest();
   const policySentToServer = req.body.policy;
   t.equal(policySentToServer, projectPolicy, 'sends correct policy');
+
   t.end();
 });