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

2 files changed, 71 insertions, 84 deletions

diff --git a/spec/controllers/groups/boards_controller_spec.rb b/spec/controllers/groups/boards_controller_spec.rb
index 6201cddecb0..4e441f86765 100644
--- a/spec/controllers/groups/boards_controller_spec.rb
+++ b/spec/controllers/groups/boards_controller_spec.rb
@@ -3,11 +3,14 @@
 require 'spec_helper'
 
 RSpec.describe Groups::BoardsController do
-  let(:group) { create(:group) }
-  let(:user)  { create(:user) }
+  let_it_be(:group) { create(:group) }
+  let_it_be(:user)  { create(:user) }
 
-  before do
+  before_all do
     group.add_maintainer(user)
+  end
+
+  before do
     sign_in(user)
   end
 
@@ -57,46 +60,17 @@ RSpec.describe Groups::BoardsController do
       end
     end
 
-    context 'when format is JSON' do
-      it 'return an array with one group board' do
-        create(:board, group: group)
-
-        expect(Boards::VisitsFinder).not_to receive(:new)
-
-        list_boards format: :json
-
-        expect(response).to match_response_schema('boards')
-        expect(json_response.length).to eq 1
-      end
-
-      context 'with unauthorized user' do
-        before do
-          expect(Ability).to receive(:allowed?).with(user, :log_in, :global).and_call_original
-          allow(Ability).to receive(:allowed?).with(user, :read_cross_project, :global).and_return(true)
-          allow(Ability).to receive(:allowed?).with(user, :read_group, group).and_return(true)
-          allow(Ability).to receive(:allowed?).with(user, :read_issue_board, group).and_return(false)
-        end
-
-        it 'returns a not found 404 response' do
-          list_boards format: :json
-
-          expect(response).to have_gitlab_http_status(:not_found)
-          expect(response.media_type).to eq 'application/json'
-        end
-      end
-    end
-
     it_behaves_like 'disabled when using an external authorization service' do
       subject { list_boards }
     end
 
-    def list_boards(format: :html)
-      get :index, params: { group_id: group }, format: format
+    def list_boards
+      get :index, params: { group_id: group }
     end
   end
 
   describe 'GET show' do
-    let!(:board) { create(:board, group: group) }
+    let_it_be(:board) { create(:board, group: group) }
 
     context 'when format is HTML' do
       it 'renders template' do
@@ -123,12 +97,12 @@ RSpec.describe Groups::BoardsController do
       end
 
       context 'when user is signed out' do
-        let(:group) { create(:group, :public) }
+        let(:public_board) { create(:board, group: create(:group, :public)) }
 
         it 'does not save visit' do
           sign_out(user)
 
-          expect { read_board board: board }.to change(BoardGroupRecentVisit, :count).by(0)
+          expect { read_board board: public_board }.to change(BoardGroupRecentVisit, :count).by(0)
 
           expect(response).to render_template :show
           expect(response.media_type).to eq 'text/html'
@@ -136,37 +110,11 @@ RSpec.describe Groups::BoardsController do
       end
     end
 
-    context 'when format is JSON' do
-      it 'returns project board' do
-        expect(Boards::Visits::CreateService).not_to receive(:new)
-
-        read_board board: board, format: :json
-
-        expect(response).to match_response_schema('board')
-      end
-
-      context 'with unauthorized user' do
-        before do
-          expect(Ability).to receive(:allowed?).with(user, :log_in, :global).and_call_original
-          allow(Ability).to receive(:allowed?).with(user, :read_cross_project, :global).and_return(true)
-          allow(Ability).to receive(:allowed?).with(user, :read_group, group).and_return(true)
-          allow(Ability).to receive(:allowed?).with(user, :read_group, group).and_return(false)
-        end
-
-        it 'returns a not found 404 response' do
-          read_board board: board, format: :json
-
-          expect(response).to have_gitlab_http_status(:not_found)
-          expect(response.media_type).to eq 'application/json'
-        end
-      end
-    end
-
     context 'when board does not belong to group' do
       it 'returns a not found 404 response' do
         another_board = create(:board)
 
-        read_board board: another_board
+        get :show, params: { group_id: group, id: another_board.to_param }
 
         expect(response).to have_gitlab_http_status(:not_found)
       end
@@ -176,12 +124,8 @@ RSpec.describe Groups::BoardsController do
       subject { read_board board: board }
     end
 
-    def read_board(board:, format: :html)
-      get :show, params: {
-                   group_id: group,
-                   id: board.to_param
-                 },
-                 format: format
+    def read_board(board:)
+      get :show, params: { group_id: board.group, id: board.to_param }
     end
   end
 end
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