Merge pull request #5 from shivammathur/develop

1.0.2
shivammathur · Feb 29, 2020 · ac44aa2 · ac44aa2
2 parents 08cc68f + 4e92df2
commit ac44aa2
Show file tree

Hide file tree

Showing 6 changed files with 135 additions and 181 deletions.
diff --git a/__tests__/cache.test.ts b/__tests__/cache.test.ts
@@ -12,7 +12,7 @@ jest.mock('../src/cache', () => ({
       const script_path = 'extensions.sh';
 
       return (
-        'bash ' + script_path + ' "' + extensions + '-' + key + '" ' + version
+        'bash ' + script_path + ' "' + extensions + '" ' + key + ' ' + version
       );
     }
   )
@@ -42,13 +42,13 @@ describe('Install', () => {
     setEnv('7.0', 'xdebug, pcov', 'cache-v1');
     // @ts-ignore
     const script: string = await install.run();
-    expect(script).toContain('bash extensions.sh "xdebug, pcov-cache-v1" 7.0');
+    expect(script).toContain('bash extensions.sh "xdebug, pcov" cache-v1 7.0');
   });
 
   it('Test Run', async () => {
     setEnv('7.4', 'xdebug, zip', 'cache-v2');
     // @ts-ignore
     const script: string = await install.run();
-    expect(script).toContain('bash extensions.sh "xdebug, zip-cache-v2" 7.4');
+    expect(script).toContain('bash extensions.sh "xdebug, zip" cache-v2 7.4');
   });
 });
diff --git a/dist/index.js b/dist/index.js
@@ -1555,7 +1555,7 @@ function run() {
             const extensions = yield utils.getInput('extensions', true);
             const key = yield utils.getInput('key', true);
             const script_path = path.join(__dirname, '../src/extensions.sh');
-            yield exec_1.exec('bash ' + script_path + ' "' + extensions + '-' + key + '" ' + version);
+            yield exec_1.exec('bash ' + script_path + ' "' + extensions + '" ' + key + ' ' + version);
         }
         catch (error) {
             core.setFailed(error.message);