fix: Remove hg command from remoteAddr

codecov · Jul 20, 2021 · f45dc7f · f45dc7f
1 parent 07c7c3b
commit f45dc7f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/src/helpers/git.js b/src/helpers/git.js
@@ -24,16 +24,13 @@ function parseSlug(slug) {
 function parseSlugFromRemoteAddr(remoteAddr) {
   let slug = ''
   if (!remoteAddr) {
-    remoteAddr = childProcess
+    remoteAddr = (childProcess
       .spawnSync('git', [
         'config',
         '--get',
         'remote.origin.url',
-        '||',
-        'echo',
-        "''",
-      ])
-      .stdout.toString()
+      ]).stdout || '')
+      .toString()
       .trimRight()
   }
   if (remoteAddr) {

diff --git a/test/providers/provider_gitlabci.test.js b/test/providers/provider_gitlabci.test.js
@@ -47,6 +47,14 @@ describe('GitLabCI Params', () => {
       service: 'gitlab',
       slug: '',
     }
+    const spawnSync = td.replace(childProcess, 'spawnSync')
+    td.when(
+      spawnSync('git', [
+        'config',
+        '--get',
+        'remote.origin.url',
+      ]),
+    ).thenReturn({ stdout: '' })
     const params = providerGitLabci.getServiceParams(inputs)
     expect(params).toMatchObject(expected)
   })
@@ -132,9 +140,6 @@ describe('GitLabCI Params', () => {
           'config',
           '--get',
           'remote.origin.url',
-          '||',
-          'echo',
-          "''",
         ]),
       ).thenReturn({ stdout: 'https://gitlab.com/testOrg/testRepo.git' })
 
@@ -150,9 +155,6 @@ describe('GitLabCI Params', () => {
           'config',
           '--get',
           'remote.origin.url',
-          '||',
-          'echo',
-          "''",
         ]),
       ).thenReturn({ stdout: '[email protected]:/' })
 
@@ -168,9 +170,6 @@ describe('GitLabCI Params', () => {
           'config',
           '--get',
           'remote.origin.url',
-          '||',
-          'echo',
-          "''",
         ]),
       ).thenReturn({ stdout: '' })
 

diff --git a/test/providers/provider_jenkinsci.test.js b/test/providers/provider_jenkinsci.test.js
@@ -77,6 +77,14 @@ describe('Jenkins CI Params', () => {
       service: 'jenkins',
       slug: '',
     }
+    const spawnSync = td.replace(childProcess, 'spawnSync')
+    td.when(
+      spawnSync('git', [
+        'config',
+        '--get',
+        'remote.origin.url',
+      ]),
+    ).thenReturn({ stdout: '' })
     const params = providerJenkinsci.getServiceParams(inputs)
     expect(params).toMatchObject(expected)
   })