Merge pull request #1441 from snyk/fix/woof-safety

woof command language selection works

src/cli/commands/woof.ts

@@ -1,9 +1,5 @@
 import { MethodArgs, ArgsOptions } from '../args';
 
-interface WoofOptions {
-  language?: string; // ISO 639-1 code
-}
-
 const woofs = {
   en: 'Woof!',
   he: ' !הב ',
@@ -12,13 +8,22 @@ const woofs = {
   cs: ' Haf!',
 };
 
-export = function woof(...args0: MethodArgs) {
-  const args = [...args0];
-  let options: WoofOptions = {};
-  if (typeof args[args.length - 1] === 'object') {
-    options = (args.pop() as ArgsOptions) as WoofOptions;
+export function getWoofLanguage(args: MethodArgs): string {
+  const options = args.pop() as ArgsOptions;
+  let lang = 'en';
+
+  if (
+    typeof options.language === 'string' &&
+    Object.keys(woofs).includes(options.language)
+  ) {
+    lang = options.language;
   }
-  const lang = options.language || 'en';
+
+  return lang;
+}
+
+export default function woof(...args: MethodArgs) {
+  const lang = getWoofLanguage(args);
   console.log(`
     |         |
    /|         |\\
@@ -35,4 +40,4 @@ export = function woof(...args0: MethodArgs) {
         \\U/ --( ${woofs[lang]} )
                \\-----/
 `);
-};
+}

test/woof.spec.ts

@@ -0,0 +1,28 @@
+import { getWoofLanguage } from '../src/cli/commands/woof';
+
+describe('Woof command - Language option', () => {
+  it('Default language is "en"', () => {
+    // $ snyk woof
+    expect(getWoofLanguage([{} as any])).toEqual('en');
+  });
+
+  it('Returns selected language', () => {
+    expect(
+      getWoofLanguage([
+        {
+          language: 'he',
+        } as any,
+      ]),
+    ).toEqual('he');
+  });
+
+  it('Returns default when selected language is invalid', () => {
+    expect(
+      getWoofLanguage([
+        {
+          language: 'toString',
+        } as any,
+      ]),
+    ).toEqual('en');
+  });
+});