Move tools config to tools.json

Refactor tools functions to use Records and object literals
jrfnl · Jul 7, 2021 · 6449431 · 6449431
1 parent 60ff774
commit 6449431
Show file tree

Hide file tree

Showing 11 changed files with 1,203 additions and 797 deletions.
diff --git a/__tests__/tools.test.ts b/__tests__/tools.test.ts
diff --git a/__tests__/utils.test.ts b/__tests__/utils.test.ts
@@ -32,7 +32,7 @@ describe('Utils tests', () => {
     expect(await utils.getInput('test', false)).toBe('setup-php');
     expect(await utils.getInput('setup-php', false)).toBe('setup-php');
     expect(await utils.getInput('DoesNotExist', false)).toBe('');
-    expect(async () => {
+    await expect(async () => {
       await utils.getInput('DoesNotExist', true);
     }).rejects.toThrow('Input required and not supplied: DoesNotExist');
   });
@@ -70,7 +70,7 @@ describe('Utils tests', () => {
     expect(await utils.color('warning')).toBe('33');
   });
 
-  it('checking readScripts', async () => {
+  it('checking readFile', async () => {
     const darwin: string = fs.readFileSync(
       path.join(__dirname, '../src/scripts/darwin.sh'),
       'utf8'
@@ -83,12 +83,12 @@ describe('Utils tests', () => {
       path.join(__dirname, '../src/scripts/win32.ps1'),
       'utf8'
     );
-    expect(await utils.readScript('darwin.sh')).toBe(darwin);
-    expect(await utils.readScript('darwin.sh')).toBe(darwin);
-    expect(await utils.readScript('linux.sh')).toBe(linux);
-    expect(await utils.readScript('linux.sh')).toBe(linux);
-    expect(await utils.readScript('win32.ps1')).toBe(win32);
-    expect(await utils.readScript('win32.ps1')).toBe(win32);
+    expect(await utils.readFile('darwin.sh', 'src/scripts')).toBe(darwin);
+    expect(await utils.readFile('darwin.sh', 'src/scripts')).toBe(darwin);
+    expect(await utils.readFile('linux.sh', 'src/scripts')).toBe(linux);
+    expect(await utils.readFile('linux.sh', 'src/scripts')).toBe(linux);
+    expect(await utils.readFile('win32.ps1', 'src/scripts')).toBe(win32);
+    expect(await utils.readFile('win32.ps1', 'src/scripts')).toBe(win32);
   });
 
   it('checking writeScripts', async () => {