BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
53f50edf
Commit
53f50edf
authored
Oct 10, 2016
by
Douglas Barbosa Alexandre
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix board relates specs
parent
2ad531f5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
16 deletions
+13
-16
boards_controller.rb
app/controllers/projects/boards_controller.rb
+1
-1
boards_spec.rb
spec/features/boards/boards_spec.rb
+8
-8
keyboard_shortcut_spec.rb
spec/features/boards/keyboard_shortcut_spec.rb
+1
-3
new_issue_spec.rb
spec/features/boards/new_issue_spec.rb
+2
-2
board.json
spec/fixtures/api/schemas/board.json
+1
-2
No files found.
app/controllers/projects/boards_controller.rb
View file @
53f50edf
...
...
@@ -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
spec/features/boards/boards_spec.rb
View file @
53f50edf
...
...
@@ -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
...
...
spec/features/boards/keyboard_shortcut_spec.rb
View file @
53f50edf
...
...
@@ -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
...
...
spec/features/boards/new_issue_spec.rb
View file @
53f50edf
...
...
@@ -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
...
...
spec/fixtures/api/schemas/board.json
View file @
53f50edf
{
"type"
:
"object"
,
"required"
:
[
"id"
,
"name"
"id"
],
"properties"
:
{
"id"
:
{
"type"
:
"integer"
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment