More test fixes

Author: Techn1x

app/helpers/app-version.js

@@ -16,19 +16,21 @@ export function makeHelper(version) {
     hash.versionOnly = hash.versionOnly || hash.hideSha;
     hash.shaOnly = hash.shaOnly || hash.hideVersion;
 
+    let match = null;
+
     if (hash.versionOnly) {
       if (hash.showExtended) {
-        return version.match(versionExtendedRegExp)[0]; // 1.0.0-alpha.1
+        match = version.match(versionExtendedRegExp); // 1.0.0-alpha.1
       } else {
-        return version.match(versionRegExp)[0]; // 1.0.0
+        match = version.match(versionRegExp); // 1.0.0
       }
     }
 
     if (hash.shaOnly) {
-      return version.match(shaRegExp)[0]; // 4jds75hf
+      match = version.match(shaRegExp); // 4jds75hf
     }
 
-    return version;
+    return match?match[0]:version;
   };
 }
 

tests/unit/utils/regexp-test.js

@@ -15,12 +15,12 @@ test('version reg ex matches expected strings', function(assert) {
 test('version extended reg ex matches expected strings', function(assert) {
   assert.expect(6);
 
-  assert.ok('2.0.1-alpha'.match(versionRegExp), 'Matches expected pattern.');
-  assert.ok('2.20.1-alpha.15'.match(versionRegExp), 'Matches expected pattern.');
-  assert.ok(!'1.1.1-alpha.'.match(versionRegExp), 'Does not match hanging period.');
-  assert.ok(!'1.1.1-alpha.abc'.match(versionRegExp), 'Does not match letters after extended tag period.');
-  assert.ok(!'a.b.c-alpha.15'.match(versionRegExp), 'Does not match letters.');
-  assert.ok(!'git12sha'.match(versionRegExp), 'Does not match sha.');
+  assert.ok('2.0.1-alpha'.match(versionExtendedRegExp), 'Matches expected pattern.');
+  assert.ok('2.20.1-alpha.15'.match(versionExtendedRegExp), 'Matches expected pattern.');
+  assert.ok(!'1.1.1-alpha.'.match(versionExtendedRegExp), 'Does not match hanging period.');
+  assert.ok(!'1.1.1-alpha.abc'.match(versionExtendedRegExp), 'Does not match letters after extended tag period.');
+  assert.ok(!'a.b.c-alpha.15'.match(versionExtendedRegExp), 'Does not match letters.');
+  assert.ok(!'git12sha'.match(versionExtendedRegExp), 'Does not match sha.');
 });
 
 test('git sha reg ex matches expected strings', function(assert) {