diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 21:07:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-27 21:07:48 +0300 |
commit | e20baee820ea2c76ee16980a98e8080f255d9035 (patch) | |
tree | 6e13a73bee42b7ef310850d03982faebea17a0b1 /spec/controllers | |
parent | 71c5863d7b1ca9836a7d7703f35750cd726a9846 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/controllers')
-rw-r--r-- | spec/controllers/admin/application_settings_controller_spec.rb | 4 | ||||
-rw-r--r-- | spec/controllers/admin/projects_controller_spec.rb | 12 |
2 files changed, 16 insertions, 0 deletions
diff --git a/spec/controllers/admin/application_settings_controller_spec.rb b/spec/controllers/admin/application_settings_controller_spec.rb index 05c4743ed7f..f28465f0555 100644 --- a/spec/controllers/admin/application_settings_controller_spec.rb +++ b/spec/controllers/admin/application_settings_controller_spec.rb @@ -127,6 +127,10 @@ describe Admin::ApplicationSettingsController do end describe 'verify panel actions' do + before do + stub_feature_flags(instance_level_integrations: false) + end + Admin::ApplicationSettingsController::VALID_SETTING_PANELS.each do |valid_action| it_behaves_like 'renders correct panels' do let(:action) { valid_action } diff --git a/spec/controllers/admin/projects_controller_spec.rb b/spec/controllers/admin/projects_controller_spec.rb index 2d783dab621..f0157fb4260 100644 --- a/spec/controllers/admin/projects_controller_spec.rb +++ b/spec/controllers/admin/projects_controller_spec.rb @@ -24,6 +24,18 @@ describe Admin::ProjectsController do expect(response.body).not_to match(project.name) end + it 'retrieves archived and non archived corrupted projects when last_repository_check_failed is true' do + archived_corrupted_project = create(:project, :public, :archived, :last_repository_check_failed, name: 'CorruptedArchived', path: 'A') + corrupted_project = create(:project, :public, :last_repository_check_failed, name: 'CorruptedOnly', path: 'C') + + get :index, params: { last_repository_check_failed: true } + + expect(response).to have_gitlab_http_status(:ok) + expect(response.body).not_to match(project.name) + expect(response.body).to match(archived_corrupted_project.name) + expect(response.body).to match(corrupted_project.name) + end + it 'does not respond with projects pending deletion' do pending_delete_project = create(:project, pending_delete: true) |