Add latest changes from gitlab-org/gitlab@15-5-stable-eev15.5.0-rc42

1 files changed, 57 insertions, 14 deletions

diff --git a/spec/controllers/groups/runners_controller_spec.rb b/spec/controllers/groups/runners_controller_spec.rb
index 77c62c0d930..6dbf0803892 100644
--- a/spec/controllers/groups/runners_controller_spec.rb
+++ b/spec/controllers/groups/runners_controller_spec.rb
@@ -8,9 +8,11 @@ RSpec.describe Groups::RunnersController do
   let_it_be(:project) { create(:project, group: group) }
 
   let!(:runner) { create(:ci_runner, :group, groups: [group]) }
-  let!(:runner_project) { create(:ci_runner, :project, projects: [project]) }
+  let!(:project_runner) { create(:ci_runner, :project, projects: [project]) }
+  let!(:instance_runner) { create(:ci_runner, :instance) }
 
-  let(:params_runner_project) { { group_id: group, id: runner_project } }
+  let(:params_runner_project) { { group_id: group, id: project_runner } }
+  let(:params_runner_instance) { { group_id: group, id: instance_runner } }
   let(:params) { { group_id: group, id: runner } }
 
   before do
@@ -70,8 +72,15 @@ RSpec.describe Groups::RunnersController do
         expect(response).to render_template(:show)
       end
 
+      it 'renders show with 200 status code instance runner' do
+        get :show, params: { group_id: group, id: instance_runner }
+
+        expect(response).to have_gitlab_http_status(:ok)
+        expect(response).to render_template(:show)
+      end
+
       it 'renders show with 200 status code project runner' do
-        get :show, params: { group_id: group, id: runner_project }
+        get :show, params: { group_id: group, id: project_runner }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template(:show)
@@ -89,8 +98,14 @@ RSpec.describe Groups::RunnersController do
         expect(response).to have_gitlab_http_status(:not_found)
       end
 
+      it 'renders a 404 instance runner' do
+        get :show, params: { group_id: group, id: instance_runner }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+
       it 'renders a 404 project runner' do
-        get :show, params: { group_id: group, id: runner_project }
+        get :show, params: { group_id: group, id: project_runner }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -103,15 +118,21 @@ RSpec.describe Groups::RunnersController do
         group.add_owner(user)
       end
 
-      it 'renders show with 200 status code' do
+      it 'renders edit with 200 status code' do
         get :edit, params: { group_id: group, id: runner }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template(:edit)
       end
 
-      it 'renders show with 200 status code project runner' do
-        get :edit, params: { group_id: group, id: runner_project }
+      it 'renders a 404 instance runner' do
+        get :edit, params: { group_id: group, id: instance_runner }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+
+      it 'renders edit with 200 status code project runner' do
+        get :edit, params: { group_id: group, id: project_runner }
 
         expect(response).to have_gitlab_http_status(:ok)
         expect(response).to render_template(:edit)
@@ -130,7 +151,7 @@ RSpec.describe Groups::RunnersController do
       end
 
       it 'renders a 404 project runner' do
-        get :edit, params: { group_id: group, id: runner_project }
+        get :edit, params: { group_id: group, id: project_runner }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -154,15 +175,26 @@ RSpec.describe Groups::RunnersController do
         expect(runner.reload.description).to eq(new_desc)
       end
 
+      it 'does not update the instance runner' do
+        new_desc = instance_runner.description.swapcase
+
+        expect do
+          post :update, params: params_runner_instance.merge(runner: { description: new_desc } )
+        end.to not_change { instance_runner.ensure_runner_queue_value }
+           .and not_change { instance_runner.description }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+
       it 'updates the project runner, ticks the queue, and redirects project runner' do
-        new_desc = runner_project.description.swapcase
+        new_desc = project_runner.description.swapcase
 
         expect do
           post :update, params: params_runner_project.merge(runner: { description: new_desc } )
-        end.to change { runner_project.ensure_runner_queue_value }
+        end.to change { project_runner.ensure_runner_queue_value }
 
         expect(response).to have_gitlab_http_status(:found)
-        expect(runner_project.reload.description).to eq(new_desc)
+        expect(project_runner.reload.description).to eq(new_desc)
       end
     end
 
@@ -182,15 +214,26 @@ RSpec.describe Groups::RunnersController do
         expect(runner.reload.description).to eq(old_desc)
       end
 
+      it 'rejects the update and responds 404 instance runner' do
+        old_desc = instance_runner.description
+
+        expect do
+          post :update, params: params_runner_instance.merge(runner: { description: old_desc.swapcase } )
+        end.not_to change { instance_runner.ensure_runner_queue_value }
+
+        expect(response).to have_gitlab_http_status(:not_found)
+        expect(instance_runner.reload.description).to eq(old_desc)
+      end
+
       it 'rejects the update and responds 404 project runner' do
-        old_desc = runner_project.description
+        old_desc = project_runner.description
 
         expect do
           post :update, params: params_runner_project.merge(runner: { description: old_desc.swapcase } )
-        end.not_to change { runner_project.ensure_runner_queue_value }
+        end.not_to change { project_runner.ensure_runner_queue_value }
 
         expect(response).to have_gitlab_http_status(:not_found)
-        expect(runner_project.reload.description).to eq(old_desc)
+        expect(project_runner.reload.description).to eq(old_desc)
       end
     end
   end