diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-21 15:08:13 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-12-21 15:08:13 +0000 |
commit | d4aa95428e9ae63a476196bc8c1193d3de253530 (patch) | |
tree | fa8b39ee60e5c53812b995ec8da643dbeac1bd39 /spec/views | |
parent | 0259af319f67b1776c78c0e8132d8b549489984e (diff) | |
download | gitlab-ce-d4aa95428e9ae63a476196bc8c1193d3de253530.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/views')
-rw-r--r-- | spec/views/admin/application_settings/general.html.haml_spec.rb | 6 | ||||
-rw-r--r-- | spec/views/groups/edit.html.haml_spec.rb | 8 | ||||
-rw-r--r-- | spec/views/projects/edit.html.haml_spec.rb | 6 |
3 files changed, 3 insertions, 17 deletions
diff --git a/spec/views/admin/application_settings/general.html.haml_spec.rb b/spec/views/admin/application_settings/general.html.haml_spec.rb index f229fd2dcdc..dd49de8f880 100644 --- a/spec/views/admin/application_settings/general.html.haml_spec.rb +++ b/spec/views/admin/application_settings/general.html.haml_spec.rb @@ -46,13 +46,9 @@ RSpec.describe 'admin/application_settings/general.html.haml' do it_behaves_like 'does not render registration features prompt', :application_setting_disabled_repository_size_limit end - context 'with no license and service ping disabled' do + context 'with no license and service ping disabled', :without_license do before do stub_application_setting(usage_ping_enabled: false) - - if Gitlab.ee? - allow(License).to receive(:current).and_return(nil) - end end it_behaves_like 'renders registration features prompt', :application_setting_disabled_repository_size_limit diff --git a/spec/views/groups/edit.html.haml_spec.rb b/spec/views/groups/edit.html.haml_spec.rb index ddcfea0ab10..fda93ebab51 100644 --- a/spec/views/groups/edit.html.haml_spec.rb +++ b/spec/views/groups/edit.html.haml_spec.rb @@ -127,13 +127,7 @@ RSpec.describe 'groups/edit.html.haml' do allow(view).to receive(:current_user) { user } end - context 'prompt user about registration features' do - before do - if Gitlab.ee? - allow(License).to receive(:current).and_return(nil) - end - end - + context 'prompt user about registration features', :without_license do context 'with service ping disabled' do before do stub_application_setting(usage_ping_enabled: false) diff --git a/spec/views/projects/edit.html.haml_spec.rb b/spec/views/projects/edit.html.haml_spec.rb index 2935e4395ba..bf154b61609 100644 --- a/spec/views/projects/edit.html.haml_spec.rb +++ b/spec/views/projects/edit.html.haml_spec.rb @@ -93,13 +93,9 @@ RSpec.describe 'projects/edit' do it_behaves_like 'does not render registration features prompt', :project_disabled_repository_size_limit end - context 'with no license and service ping disabled' do + context 'with no license and service ping disabled', :without_license do before do stub_application_setting(usage_ping_enabled: false) - - if Gitlab.ee? - allow(License).to receive(:current).and_return(nil) - end end it_behaves_like 'renders registration features prompt', :project_disabled_repository_size_limit |