Move action to render board lists to `Projects::Boards::ListsController`

2 files changed, 51 insertions, 51 deletions

diff --git a/spec/controllers/projects/boards/lists_controller_spec.rb b/spec/controllers/projects/boards/lists_controller_spec.rb
index 3d7d3588165..8e6b496e1d6 100644
--- a/spec/controllers/projects/boards/lists_controller_spec.rb
+++ b/spec/controllers/projects/boards/lists_controller_spec.rb
@@ -11,6 +11,46 @@ describe Projects::Boards::ListsController do
     project.team << [guest, :guest]
   end
 
+  describe 'GET #index' do
+    it 'returns a successful 200 response' do
+      read_board_list user: user
+
+      expect(response).to have_http_status(200)
+      expect(response.content_type).to eq 'application/json'
+    end
+
+    it 'returns a list of board lists' do
+      board = project.create_board
+      create(:backlog_list, board: board)
+      create(:list, board: board)
+      create(:done_list, board: board)
+
+      read_board_list user: user
+
+      parsed_response = JSON.parse(response.body)
+
+      expect(response).to match_response_schema('list', array: true)
+      expect(parsed_response.length).to eq 3
+    end
+
+    it 'returns a successful 403 response with unauthorized user' do
+      allow(Ability.abilities).to receive(:allowed?).with(user, :read_project, project).and_return(true)
+      allow(Ability.abilities).to receive(:allowed?).with(user, :read_list, project).and_return(false)
+
+      read_board_list user: user
+
+      expect(response).to have_http_status(403)
+    end
+
+    def read_board_list(user:)
+      sign_in(user)
+
+      get :index, namespace_id: project.namespace.to_param,
+                  project_id: project.to_param,
+                  format: :json
+    end
+  end
+
   describe 'POST #create' do
     let(:label) { create(:label, project: project, name: 'Development') }
 
diff --git a/spec/controllers/projects/boards_controller_spec.rb b/spec/controllers/projects/boards_controller_spec.rb
index 7ef4b786b42..2c0e3e5df31 100644
--- a/spec/controllers/projects/boards_controller_spec.rb
+++ b/spec/controllers/projects/boards_controller_spec.rb
@@ -10,64 +10,24 @@ describe Projects::BoardsController do
   end
 
   describe 'GET #show' do
-    context 'when project does not have a board' do
-      it 'creates a new board' do
-        expect { read_board }.to change(Board, :count).by(1)
-      end
+    it 'creates a new board when project does not have one' do
+      expect { read_board }.to change(Board, :count).by(1)
     end
 
-    context 'when format is HTML' do
-      it 'renders HTML template' do
-        read_board
+    it 'renders HTML template' do
+      read_board
 
-        expect(response).to render_template :show
-        expect(response.content_type).to eq 'text/html'
-      end
-
-      context 'with unauthorized user' do
-        it 'returns a successful 404 response' do
-          allow(Ability.abilities).to receive(:allowed?).with(user, :read_project, project).and_return(true)
-          allow(Ability.abilities).to receive(:allowed?).with(user, :read_board, project).and_return(false)
-
-          read_board
-
-          expect(response).to have_http_status(404)
-        end
-      end
+      expect(response).to render_template :show
+      expect(response.content_type).to eq 'text/html'
     end
 
-    context 'when format is JSON' do
-      it 'returns a successful 200 response' do
-        read_board format: :json
-
-        expect(response).to have_http_status(200)
-        expect(response.content_type).to eq 'application/json'
-      end
-
-      it 'returns a list of board lists' do
-        board = project.create_board
-        create(:backlog_list, board: board)
-        create(:list, board: board)
-        create(:done_list, board: board)
-
-        read_board format: :json
-
-        parsed_response = JSON.parse(response.body)
-
-        expect(response).to match_response_schema('list', array: true)
-        expect(parsed_response.length).to eq 3
-      end
-
-      context 'with unauthorized user' do
-        it 'returns a successful 403 response' do
-          allow(Ability.abilities).to receive(:allowed?).with(user, :read_project, project).and_return(true)
-          allow(Ability.abilities).to receive(:allowed?).with(user, :read_board, project).and_return(false)
+    it 'returns a successful 404 response with unauthorized user' do
+      allow(Ability.abilities).to receive(:allowed?).with(user, :read_project, project).and_return(true)
+      allow(Ability.abilities).to receive(:allowed?).with(user, :read_board, project).and_return(false)
 
-          read_board format: :json
+      read_board
 
-          expect(response).to have_http_status(403)
-        end
-      end
+      expect(response).to have_http_status(404)
     end
 
     def read_board(format: :html)