Commit f66f5b55 authored by Heinrich Lee Yu's avatar Heinrich Lee Yu

Merge branch '320882-epic-board-show-page' into 'master'

Epic boards show page

See merge request gitlab-org/gitlab!54141
parents a5cbb712 f731241a
......@@ -66,7 +66,11 @@ module BoardsResponses
end
def respond_with_board
respond_with(@board) # rubocop:disable Gitlab/ModuleWithInstanceVariables
# rubocop:disable Gitlab/ModuleWithInstanceVariables
return render_404 unless @board
respond_with(@board)
# rubocop:enable Gitlab/ModuleWithInstanceVariables
end
def serialize_as_json(resource)
......
= render "shared/boards/show", board: @board, group: true
......@@ -138,7 +138,7 @@ constraints(::Constraints::GroupUrlConstrainer.new) do
end
end
resources :epic_boards, only: [:index]
resources :epic_boards, only: [:index, :show]
namespace :security do
resource :dashboard, only: [:show], controller: :dashboard
......
......@@ -3,8 +3,12 @@
require 'spec_helper'
RSpec.describe Groups::EpicBoardsController do
let(:group) { create(:group) }
let(:user) { create(:user) }
let_it_be(:public_group) { create(:group, :public) }
let_it_be(:private_group) { create(:group, :private) }
let_it_be(:user) { create(:user) }
let_it_be(:other_user) { create(:user) }
let(:group) { public_group }
before do
group.add_maintainer(user)
......@@ -17,8 +21,6 @@ RSpec.describe Groups::EpicBoardsController do
end
context 'with unauthorized user' do
let(:other_user) { create(:user) }
before do
sign_in(other_user)
end
......@@ -47,4 +49,78 @@ RSpec.describe Groups::EpicBoardsController do
get :index, params: { group_id: group }, format: format
end
end
describe 'GET show' do
let!(:board) { create(:epic_board, group: group) }
context 'json request' do
it 'is not supported' do
read_board(board: board, format: :json)
expect(response).to have_gitlab_http_status(:not_found)
end
end
context 'when format is HTML' do
it 'renders template' do
# epic board visits not supported yet
# https://gitlab.com/gitlab-org/gitlab/-/issues/321625
expect { read_board board: board }.not_to change(BoardGroupRecentVisit, :count)
expect(response).to render_template :show
expect(response.media_type).to eq 'text/html'
end
context 'with unauthorized user' do
let(:group) { private_group }
before do
# sign in some other user not in the private group
sign_in(other_user)
end
it 'returns a not found 404 response' do
read_board board: board
expect(response).to have_gitlab_http_status(:not_found)
expect(response.media_type).to eq 'text/html'
end
end
context 'when user is signed out' do
let(:group) { public_group }
it 'does not save visit' do
sign_out(user)
# epic board visits not supported yet
expect { read_board board: board }.not_to change(BoardGroupRecentVisit, :count)
expect(response).to render_template :show
expect(response.media_type).to eq 'text/html'
end
end
end
context 'when epic board does not belong to group' do
it 'returns a not found 404 response' do
another_board = create(:epic_board)
read_board board: another_board
expect(response).to have_gitlab_http_status(:not_found)
end
end
it_behaves_like 'disabled when using an external authorization service' 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
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment