diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-21 02:50:22 +0300 |
commit | 9dc93a4519d9d5d7be48ff274127136236a3adb3 (patch) | |
tree | 70467ae3692a0e35e5ea56bcb803eb512a10bedb /spec/views/admin | |
parent | 4b0f34b6d759d6299322b3a54453e930c6121ff0 (diff) |
Add latest changes from gitlab-org/gitlab@13-11-stable-eev13.11.0-rc43
Diffstat (limited to 'spec/views/admin')
-rw-r--r-- | spec/views/admin/dashboard/index.html.haml_spec.rb | 2 | ||||
-rw-r--r-- | spec/views/admin/services/index.html.haml_spec.rb | 30 |
2 files changed, 1 insertions, 31 deletions
diff --git a/spec/views/admin/dashboard/index.html.haml_spec.rb b/spec/views/admin/dashboard/index.html.haml_spec.rb index 5494b908705..6c7d8d2c165 100644 --- a/spec/views/admin/dashboard/index.html.haml_spec.rb +++ b/spec/views/admin/dashboard/index.html.haml_spec.rb @@ -29,7 +29,7 @@ RSpec.describe 'admin/dashboard/index.html.haml' do it "includes revision of GitLab" do render - expect(rendered).to have_content "#{Gitlab::VERSION} (#{Gitlab.revision})" + expect(rendered).to have_content "#{Gitlab::VERSION} #{Gitlab.revision}" end it 'does not include license breakdown' do diff --git a/spec/views/admin/services/index.html.haml_spec.rb b/spec/views/admin/services/index.html.haml_spec.rb deleted file mode 100644 index e8cd2dde67e..00000000000 --- a/spec/views/admin/services/index.html.haml_spec.rb +++ /dev/null @@ -1,30 +0,0 @@ -# frozen_string_literal: true - -require 'spec_helper' - -RSpec.describe 'admin/services/index.html.haml' do - before do - assign(:services, build_stubbed_list(:service, 1)) - assign(:existing_instance_types, []) - end - - context 'user has not dismissed Service Templates deprecation message' do - it 'shows the message' do - allow(view).to receive(:show_service_templates_deprecated?).and_return(true) - - render - - expect(rendered).to have_content('Service Templates will soon be deprecated.') - end - end - - context 'user has dismissed Service Templates deprecation message' do - it 'does not show the message' do - allow(view).to receive(:show_service_templates_deprecated?).and_return(false) - - render - - expect(rendered).not_to have_content('Service Templates will soon be deprecated.') - end - end -end |