Moved getOptions to utils.ts

fantonangeli · Nov 13, 2021 · c2978bf · c2978bf
1 parent dc15c1a
commit c2978bf
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 27 deletions.
diff --git a/src/common.ts b/src/common.ts
@@ -4,6 +4,7 @@ import * as child_process from 'child_process';
 const exec = util.promisify(child_process.exec);
 import { Config } from './config';
 import {OptionValues} from 'commander';
+import {getOptions} from './utils';
 
 
 /**
@@ -44,19 +45,6 @@ export function readMultiClaspConfig(): SingleClasp[] {
   return JSON.parse(fs.readFileSync(Config.MULTICLASP_FILENAME, Config.UTF_8 as BufferEncoding).toString());
 }
 
-/**
- * Get the Options for the clasp command.
- *
- * @param args array of arguments
- * @returns the string with the options, "" otherwise
- */
-export function getOptions (args:string[]=process.argv):string {
-  if (!args) {
-    return "";
-  }
-  return args.slice(3).join(' ');
-}
-
 /**
  * commander action to run clasp.
  *

diff --git a/src/utils.ts b/src/utils.ts
@@ -9,3 +9,16 @@ export const parseJsonOrDie = <T>(value: string): T => {
     throw "Invalid json";
   }
 };
+
+/**
+ * Get the Options for the clasp command.
+ *
+ * @param args array of arguments
+ * @returns the string with the options, "" otherwise
+ */
+export function getOptions (args:string[]=process.argv):string {
+  if (!args) {
+    return "";
+  }
+  return args.slice(3).join(' ');
+}
diff --git a/test/common.test.ts b/test/common.test.ts
@@ -1,5 +1,5 @@
 import * as fs from "fs";
-import { getOptions, runClasp } from '../src/common';
+import { runClasp } from '../src/common';
 
 jest.mock('util', () => ({
     promisify: jest.fn(() => {
@@ -24,17 +24,4 @@ describe('common.js tests', () => {
             expect(fs.writeFile).toHaveBeenCalledTimes(1);
         });
     });
-
-  describe('getOptions', () => {
-    test('wrong inputs', () => {
-      expect(getOptions([])).toBe("");
-      expect(getOptions(undefined)).toBe("");
-    })
-    test('good inputs', () => {
-      expect(getOptions(["node", "multi-clasp", "push"])).toBe("");
-      expect(getOptions(["node", "multi-clasp", "push", "-f"])).toBe("-f");
-      expect(getOptions(["node", "multi-clasp", "push", "-f", "-g", "what"])).toBe("-f -g what");
-      expect(getOptions(["node", "multi-clasp", "run", "-p", '\'["what"]\''])).toBe("-p '[\"what\"]'");
-    })
-  });
 });
diff --git a/test/utils.test.ts b/test/utils.test.ts
@@ -0,0 +1,16 @@
+import {getOptions} from "../src/utils";
+
+describe('utils.js tests', () => {
+  describe('getOptions', () => {
+    test('wrong inputs', () => {
+      expect(getOptions([])).toBe("");
+      expect(getOptions(undefined)).toBe("");
+    })
+    test('good inputs', () => {
+      expect(getOptions(["node", "multi-clasp", "push"])).toBe("");
+      expect(getOptions(["node", "multi-clasp", "push", "-f"])).toBe("-f");
+      expect(getOptions(["node", "multi-clasp", "push", "-f", "-g", "what"])).toBe("-f -g what");
+      expect(getOptions(["node", "multi-clasp", "run", "-p", '\'["what"]\''])).toBe("-p '[\"what\"]'");
+    })
+  });
+});