diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 15:16:46 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 15:16:46 +0000 |
commit | b29897912420b27d79fbbf2f5b3bef3a16278339 (patch) | |
tree | 4401e45b7bae5e9145388f73f6e70158c81ff302 | |
parent | 4177ade69aea16948ba097e67ed7ebe05f6e1993 (diff) | |
download | gitlab-ce-b29897912420b27d79fbbf2f5b3bef3a16278339.tar.gz |
Add latest changes from gitlab-org/gitlab@13-11-stable-ee
-rw-r--r-- | spec/views/admin/dashboard/index.html.haml_spec.rb | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb index 6c7d8d2c165..43a6fcc2adc 100644 --- a/spec/views/admin/dashboard/index.html.haml_spec.rb +++ b/spec/views/admin/dashboard/index.html.haml_spec.rb @@ -4,6 +4,7 @@ require 'spec_helper' RSpec.describe 'admin/dashboard/index.html.haml' do include Devise::Test::ControllerHelpers + include StubVersion before do counts = Admin::DashboardController::COUNTED_ITEMS.each_with_object({}) do |item, hash| @@ -26,10 +27,21 @@ RSpec.describe 'admin/dashboard/index.html.haml' do expect(rendered).to have_content Gitlab::Workhorse.version end - it "includes revision of GitLab" do + it "includes revision of GitLab for pre VERSION" do + stub_version('13.11.0-pre', 'abcdefg') + + render + + expect(rendered).to have_content "13.11.0-pre abcdefg" + end + + it 'shows the tag for GitLab version' do + stub_version('13.11.0', 'abcdefg') + render - expect(rendered).to have_content "#{Gitlab::VERSION} #{Gitlab.revision}" + expect(rendered).to have_content "13.11.0" + expect(rendered).not_to have_content "abcdefg" end it 'does not include license breakdown' do |