From b09e40624b9fc6a7b4a7b38f174bc66d996e3fd5 Mon Sep 17 00:00:00 2001
From: Bob Van Landuyt <bob@vanlanduyt.co>
Date: Mon, 1 Oct 2018 15:59:44 +0200
Subject: Show the commit-sha for pre-release versions

The pre-release tags are set at the beginning of a release, so it
would be impossible to figure out which version was running if we're
running nightlies.

In that case it's better to still link to the SHA. These versions
don't get deployed to .com.
---
 spec/support/stub_version.rb            |  8 +++++++
 spec/views/help/index.html.haml_spec.rb | 41 ++++++++++++++++++++++-----------
 2 files changed, 36 insertions(+), 13 deletions(-)
 create mode 100644 spec/support/stub_version.rb

(limited to 'spec')

diff --git a/spec/support/stub_version.rb b/spec/support/stub_version.rb
new file mode 100644
index 00000000000..594ab64e7c6
--- /dev/null
+++ b/spec/support/stub_version.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module StubVersion
+  def stub_version(version, revision)
+    stub_const('Gitlab::VERSION', version)
+    allow(Gitlab).to receive(:revision).and_return(revision)
+  end
+end
diff --git a/spec/views/help/index.html.haml_spec.rb b/spec/views/help/index.html.haml_spec.rb
index c8c9c4e773d..34e93d929a7 100644
--- a/spec/views/help/index.html.haml_spec.rb
+++ b/spec/views/help/index.html.haml_spec.rb
@@ -1,11 +1,18 @@
+# frozen_string_literal: true
+
 require 'rails_helper'
 
 describe 'help/index' do
+  include StubVersion
+
   describe 'version information' do
+    before do
+      stub_helpers
+    end
+
     it 'is hidden from guests' do
       stub_user(nil)
       stub_version('8.0.2', 'abcdefg')
-      stub_helpers
 
       render
 
@@ -13,15 +20,28 @@ describe 'help/index' do
       expect(rendered).not_to match 'abcdefg'
     end
 
-    it 'is shown to users' do
-      stub_user
-      stub_version('8.0.2', 'abcdefg')
-      stub_helpers
+    context 'when logged in' do
+      before do
+        stub_user
+      end
 
-      render
+      it 'shows a link to the tag to users' do
+        stub_version('8.0.2', 'abcdefg')
+
+        render
+
+        expect(rendered).to match '8.0.2'
+        expect(rendered).to have_link('8.0.2', href: %r{https://gitlab.com/gitlab-org/gitlab-(ce|ee)/tags/v8.0.2})
+      end
+
+      it 'shows a link to the commit for pre-releases' do
+        stub_version('8.0.2-pre', 'abcdefg')
 
-      expect(rendered).to match '8.0.2'
-      expect(rendered).to have_link('8.0.2', href: 'https://gitlab.com/gitlab-org/gitlab-ce/tags/v8.0.2')
+        render
+
+        expect(rendered).to match '8.0.2'
+        expect(rendered).to have_link('abcdefg', href: %r{https://gitlab.com/gitlab-org/gitlab-(ce|ee)/commits/abcdefg})
+      end
     end
   end
 
@@ -37,11 +57,6 @@ describe 'help/index' do
     allow(view).to receive(:user_signed_in?).and_return(user)
   end
 
-  def stub_version(version, revision)
-    stub_const('Gitlab::VERSION', version)
-    allow(Gitlab).to receive(:revision).and_return(revision)
-  end
-
   def stub_helpers
     allow(view).to receive(:markdown).and_return('')
     allow(view).to receive(:version_status_badge).and_return('')
-- 
cgit v1.2.1