pleroma-fe

commit: c8794b2b840e628687342c0fade2da4a9fd2cd12
parent: e7ff9b5227bc5bb188c57e4d835735dbcd0beb28
Author: Shpuld Shpludson <shp@cock.li>
Date:   Sun,  7 Jul 2019 10:30:45 +0000

Merge branch '580' into 'develop'

Fix backend version string parsing

Closes #580

See merge request pleroma/pleroma-fe!868
Diffstat:
M
src/services/version/version.service.js
2
+-
A
test/unit/specs/services/version/version.service.spec.js
11
+++++++++++

2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/src/services/version/version.service.js b/src/services/version/version.service.js
@@ -1,6 +1,6 @@
 
 export const extractCommit = versionString => {
-  const regex = /-g(\w+)$/i
+  const regex = /-g(\w+)/i
   const matches = versionString.match(regex)
   return matches ? matches[1] : ''
 }
diff --git a/test/unit/specs/services/version/version.service.spec.js b/test/unit/specs/services/version/version.service.spec.js
@@ -0,0 +1,11 @@
+import { extractCommit } from 'src/services/version/version.service.js'
+
+describe('extractCommit', () => {
+  it('return short commit hash following "-g" characters', () => {
+    expect(extractCommit('1.0.0-45-g5e7aeebc')).to.eql('5e7aeebc')
+  })
+
+  it('return short commit hash without branch name', () => {
+    expect(extractCommit('1.0.0-45-g5e7aeebc-branch')).to.eql('5e7aeebc')
+  })
+})