kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Fix board relates specs

Browse source
This commit is contained in:
Douglas Barbosa Alexandre 2016-10-10 23:29:20 -03:00
parent 2ad531f5e2
commit 53f50edf4d
5 changed files with 13 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/projects/boards_controller.rb
View file

@ -32,6 +32,6 @@ class Projects::BoardsController < Projects::ApplicationController
end
def serialize_as_json(resource)
resource.as_json(only: [:id, :name])
resource.as_json(only: [:id])
end
end

16
spec/features/boards/boards_spec.rb
View file

@ -18,7 +18,7 @@ describe 'Issue Boards', feature: true, js: true do
context 'no lists' do
before do
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
expect(page).to have_selector('.board', count: 3)
end
@ -61,8 +61,8 @@ describe 'Issue Boards', feature: true, js: true do
let!(:done) { create(:label, project: project, name: 'Done') }
let!(:accepting) { create(:label, project: project, name: 'Accepting Merge Requests') }
let!(:list1) { create(:list, board: project.board, label: planning, position: 0) }
let!(:list2) { create(:list, board: project.board, label: development, position: 1) }
let!(:list1) { create(:list, board: board, label: planning, position: 0) }
let!(:list2) { create(:list, board: board, label: development, position: 1) }
let!(:confidential_issue) { create(:issue, :confidential, project: project, author: user) }
let!(:issue1) { create(:issue, project: project, assignee: user) }
@ -76,7 +76,7 @@ describe 'Issue Boards', feature: true, js: true do
let!(:issue9) { create(:labeled_issue, project: project, labels: [testing, bug, accepting]) }
before do
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
@ -170,7 +170,7 @@ describe 'Issue Boards', feature: true, js: true do
create(:issue, project: project)
end
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
page.within(find('.board', match: :first)) do
@ -604,7 +604,7 @@ describe 'Issue Boards', feature: true, js: true do
context 'keyboard shortcuts' do
before do
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
end
@ -617,7 +617,7 @@ describe 'Issue Boards', feature: true, js: true do
context 'signed out user' do
before do
logout
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
end
@ -633,7 +633,7 @@ describe 'Issue Boards', feature: true, js: true do
project.team << [user_guest, :guest]
logout
login_as(user_guest)
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
end

4
spec/features/boards/keyboard_shortcut_spec.rb
View file

@ -6,9 +6,7 @@ describe 'Issue Boards shortcut', feature: true, js: true do
let(:project) { create(:empty_project) }
before do
project.create_board
project.board.lists.create(list_type: :backlog)
project.board.lists.create(list_type: :done)
create(:board, project: project)
login_as :admin

4
spec/features/boards/new_issue_spec.rb
View file

@ -14,7 +14,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
login_as(user)
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
expect(page).to have_selector('.board', count: 3)
@ -70,7 +70,7 @@ describe 'Issue Boards new issue', feature: true, js: true do
context 'unauthorized user' do
before do
visit namespace_project_board_path(project.namespace, project)
visit namespace_project_board_path(project.namespace, project, board)
wait_for_vue_resource
end

3
spec/fixtures/api/schemas/board.json vendored
View file

@ -1,8 +1,7 @@
{
"type": "object",
"required" : [
"id",
"name"
"id"
],
"properties" : {
"id": { "type": "integer" },