diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /spec/controllers/admin | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'spec/controllers/admin')
-rw-r--r-- | spec/controllers/admin/integrations_controller_spec.rb | 2 | ||||
-rw-r--r-- | spec/controllers/admin/runners_controller_spec.rb | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/spec/controllers/admin/integrations_controller_spec.rb b/spec/controllers/admin/integrations_controller_spec.rb index 1793b3a86d1..cf6a6385425 100644 --- a/spec/controllers/admin/integrations_controller_spec.rb +++ b/spec/controllers/admin/integrations_controller_spec.rb @@ -9,7 +9,7 @@ RSpec.describe Admin::IntegrationsController do sign_in(admin) end - it_behaves_like IntegrationsActions do + it_behaves_like Integrations::Actions do let(:integration_attributes) { { instance: true, project: nil } } let(:routing_params) do diff --git a/spec/controllers/admin/runners_controller_spec.rb b/spec/controllers/admin/runners_controller_spec.rb index 996964fdcf0..b9a59e9ae5f 100644 --- a/spec/controllers/admin/runners_controller_spec.rb +++ b/spec/controllers/admin/runners_controller_spec.rb @@ -12,9 +12,11 @@ RSpec.describe Admin::RunnersController do describe '#index' do render_views - it 'lists all runners' do + before do get :index + end + it 'renders index template' do expect(response).to have_gitlab_http_status(:ok) expect(response).to render_template(:index) end |