test: assert exact errors for unsupported

snyk · Mar 30, 2021 · 3d872fb · 3d872fb
1 parent 77e6665
commit 3d872fb
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 35 deletions.
diff --git a/src/cli/modes.ts b/src/cli/modes.ts
@@ -8,7 +8,7 @@ interface ModeData {
 
 const modes: Record<string, ModeData> = {
   source: {
-    allowedCommands: ['test', 'monitor', 'fix'],
+    allowedCommands: ['test', 'monitor'],
     config: (args): [] => {
       args['source'] = true;
       return args;

diff --git a/test/cli-fix.functional.spec.ts b/test/cli-fix.functional.spec.ts
@@ -3,8 +3,7 @@ import * as fs from 'fs';
 
 import cli = require('../src/cli/commands');
 import * as snyk from '../src/lib';
-
-import * as validateFixSupported from '../src/cli/commands/fix/validate-fix-command-is-supported';
+import * as featureFlags from '../src/lib/feature-flags';
 
 import stripAnsi from 'strip-ansi';
 
@@ -49,8 +48,8 @@ const pipWithRemediation = JSON.parse(
 describe('snyk fix (functional tests)', () => {
   beforeAll(async () => {
     jest
-      .spyOn(validateFixSupported, 'validateFixCommandIsSupported')
-      .mockResolvedValue(true);
+      .spyOn(featureFlags, 'isFeatureFlagSupportedForOrg')
+      .mockResolvedValue({ ok: true });
   });
 
   afterAll(async () => {

diff --git a/test/cli-fix.system.spec.ts b/test/cli-fix.system.spec.ts
@@ -143,32 +143,6 @@ describe('snyk fix (system tests)', () => {
     testTimeout,
   );
 
-  /* this command is different
-   * it shows help text not an error when command is not supported
-   */
-  it.skip(
-    '`shows error when called with container`',
-    (done) => {
-      exec(
-        `node ${main} container fix`,
-        {
-          env: {
-            PATH: process.env.PATH,
-            SNYK_TOKEN: apiKey,
-            SNYK_API,
-            SNYK_HOST,
-          },
-        },
-        (err, stdout, stderr) => {
-          expect(stderr).toBe('');
-          expect(stdout).toMatch('COMMANDS');
-          expect(err).toBe(null);
-          done();
-        },
-      );
-    },
-    testTimeout,
-  );
   it(
     '`shows error when called with --code`',
     (done) => {

diff --git a/test/validate-fix-command-is-supported.spec.ts b/test/validate-fix-command-is-supported.spec.ts
@@ -1,4 +1,6 @@
 import { validateFixCommandIsSupported } from '../src/cli/commands/fix/validate-fix-command-is-supported';
+import { CommandNotSupportedError } from '../src/lib/errors/command-not-supported';
+import { FeatureNotSupportedByEcosystemError } from '../src/lib/errors/not-supported-by-ecosystem';
 import * as featureFlags from '../src/lib/feature-flags';
 import { ShowVulnPaths } from '../src/lib/types';
 describe('setDefaultTestOptions', () => {
@@ -19,7 +21,9 @@ describe('setDefaultTestOptions', () => {
       .spyOn(featureFlags, 'isFeatureFlagSupportedForOrg')
       .mockResolvedValue({ ok: false });
     const options = { path: '/', showVulnPaths: 'all' as ShowVulnPaths };
-    expect(validateFixCommandIsSupported(options)).rejects.toThrowError('');
+    expect(validateFixCommandIsSupported(options)).rejects.toThrowError(
+      new CommandNotSupportedError('snyk fix', undefined),
+    );
   });
 
   it('fix is NOT supported for --source + enabled FF', () => {
@@ -31,7 +35,9 @@ describe('setDefaultTestOptions', () => {
       showVulnPaths: 'all' as ShowVulnPaths,
       source: true,
     };
-    expect(validateFixCommandIsSupported(options)).rejects.toThrowError('');
+    expect(validateFixCommandIsSupported(options)).rejects.toThrowError(
+      new FeatureNotSupportedByEcosystemError('snyk fix', 'cpp'),
+    );
   });
 
   it('fix is NOT supported for --docker + enabled FF', () => {
@@ -43,7 +49,9 @@ describe('setDefaultTestOptions', () => {
       showVulnPaths: 'all' as ShowVulnPaths,
       docker: true,
     };
-    expect(validateFixCommandIsSupported(options)).rejects.toThrowError('');
+    expect(validateFixCommandIsSupported(options)).rejects.toThrowError(
+      new FeatureNotSupportedByEcosystemError('snyk fix', 'docker'),
+    );
   });
 
   it('fix is NOT supported for --code + enabled FF', () => {
@@ -55,6 +63,8 @@ describe('setDefaultTestOptions', () => {
       showVulnPaths: 'all' as ShowVulnPaths,
       code: true,
     };
-    expect(validateFixCommandIsSupported(options)).rejects.toThrowError('');
+    expect(validateFixCommandIsSupported(options)).rejects.toThrowError(
+      new FeatureNotSupportedByEcosystemError('snyk fix', 'code'),
+    );
   });
 });