Fallback to standard versionOnly when no extended tag, even if showExtended=true

Author: Techn1x

app/helpers/app-version.js

@@ -21,7 +21,9 @@ export function makeHelper(version) {
     if (versionOnly) {
       if (hash.showExtended) {
         match = version.match(versionExtendedRegExp); // 1.0.0-alpha.1
-      } else {
+      }
+      // Fallback to just version
+      if (!match) {
         match = version.match(versionRegExp); // 1.0.0
       }
     }

tests/unit/helpers/app-version-test.js

@@ -4,9 +4,13 @@ import { module, test } from 'qunit';
 const versionOnlyString = '10.20.3';
 const extendedTagOnlyString = 'alpha.15';
 const shaOnlyString = 'deadb33f';
+
 const versionString = versionOnlyString+'-'+extendedTagOnlyString+'+'+shaOnlyString;
 const appVersion = makeHelper(versionString);
 
+const standardVersionString = versionOnlyString+'+'+shaOnlyString;
+const standardAppVersion = makeHelper(standardVersionString);
+
 module('Unit | Helper | app version');
 
 test('it returns app version', function(assert) {
@@ -41,6 +45,14 @@ test('it returns only app version extended', function(assert) {
   assert.equal(result, versionOnlyString+'-'+extendedTagOnlyString, 'Returns app version extended without git sha.');
 });
 
+test('it returns only app version (falls back when no extended)', function(assert) {
+  assert.expect(1);
+
+  let result = standardAppVersion([], { versionOnly: true, showExtended: true });
+
+  assert.equal(result, versionOnlyString, 'Returns app version without git sha.');
+});
+
 test('it returns only git sha (backwards compatible)', function(assert) {
   assert.expect(1);