diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-02 21:09:12 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-02 21:09:12 +0000 |
commit | b6a26580610bc6e0ba577260744bc3b52f1ffb46 (patch) | |
tree | 86fb8ae0570000fac545f8ee2f07d1e7bf8f72de /spec/features | |
parent | 63fbe648bba03254f7658b50deb2521fa8ac08d3 (diff) | |
download | gitlab-ce-b6a26580610bc6e0ba577260744bc3b52f1ffb46.tar.gz |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 0a19180236c..68ad1e25b47 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -396,7 +396,6 @@ RSpec.describe 'Admin updates settings' do end context 'Container Registry' do - let(:feature_flag_enabled) { true } let(:client_support) { true } let(:settings_titles) do { @@ -409,18 +408,9 @@ RSpec.describe 'Admin updates settings' do before do stub_container_registry_config(enabled: true) - stub_feature_flags(container_registry_expiration_policies_throttling: feature_flag_enabled) allow(ContainerRegistry::Client).to receive(:supports_tag_delete?).and_return(client_support) end - shared_examples 'not having container registry setting' do |registry_setting| - it "lacks the container setting #{registry_setting}" do - visit ci_cd_admin_application_settings_path - - expect(page).not_to have_content(settings_titles[registry_setting]) - end - end - %i[container_registry_delete_tags_service_timeout container_registry_expiration_policies_worker_capacity container_registry_cleanup_tags_service_max_list_size].each do |setting| context "for container registry setting #{setting}" do it 'changes the setting' do @@ -434,12 +424,6 @@ RSpec.describe 'Admin updates settings' do expect(current_settings.public_send(setting)).to eq(400) expect(page).to have_content "Application settings saved successfully" end - - context 'with feature flag disabled' do - let(:feature_flag_enabled) { false } - - it_behaves_like 'not having container registry setting', setting - end end end @@ -457,12 +441,6 @@ RSpec.describe 'Admin updates settings' do expect(current_settings.container_registry_expiration_policies_caching).to eq(!old_value) expect(page).to have_content "Application settings saved successfully" end - - context 'with feature flag disabled' do - let(:feature_flag_enabled) { false } - - it_behaves_like 'not having container registry setting', :container_registry_expiration_policies_caching - end end end end |