Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
2e7bd099
Commit
2e7bd099
authored
Jan 04, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed tests
parent
cf4e8395
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
13 deletions
+14
-13
app/assets/stylesheets/pages/boards.scss
app/assets/stylesheets/pages/boards.scss
+2
-1
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
spec/features/boards/multiple_boards_spec.rb
spec/features/boards/multiple_boards_spec.rb
+11
-11
No files found.
app/assets/stylesheets/pages/boards.scss
View file @
2e7bd099
...
...
@@ -531,7 +531,8 @@
border-radius
:
50%
;
}
.issue-boards-switcher
{
.boards-switcher
{
padding-right
:
10px
;
margin-right
:
10px
;
border-right
:
1px
solid
$white-dark
;
...
...
app/views/shared/issuable/_filter.html.haml
View file @
2e7bd099
...
...
@@ -5,7 +5,7 @@
.issues-filters
.issues-details-filters.row-content-block.second-block
-
if
boards_page
&&
board
#js-multiple-boards-switcher
.filter-item.inline.
issue-
boards-switcher
{
"v-cloak"
=>
true
}
#js-multiple-boards-switcher
.filter-item.inline.boards-switcher
{
"v-cloak"
=>
true
}
=
render
"projects/boards/switcher"
,
board:
board
=
form_tag
page_filter_path
(
without:
[
:assignee_id
,
:author_id
,
:milestone_title
,
:label_name
,
:search
]),
method: :get
,
class:
'filter-form js-filter-form'
do
-
if
params
[
:search
].
present?
...
...
spec/features/boards/multiple_boards_spec.rb
View file @
2e7bd099
...
...
@@ -29,7 +29,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it
'shows a list of boards'
do
click_button
board
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
expect
(
page
).
to
have_content
(
board
.
name
)
expect
(
page
).
to
have_content
(
board2
.
name
)
end
...
...
@@ -38,7 +38,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it
'switches current board'
do
click_button
board
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
click_link
board2
.
name
end
...
...
@@ -52,7 +52,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it
'creates new board'
do
click_button
board
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
click_link
'Edit board name'
fill_in
'board-new-name'
,
with:
'Testing'
...
...
@@ -62,7 +62,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
wait_for_vue_resource
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
expect
(
page
).
to
have_content
(
'Testing'
)
end
end
...
...
@@ -70,7 +70,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it
'edits board name'
do
click_button
board
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
click_link
'Edit board name'
fill_in
'board-new-name'
,
with:
'Testing'
...
...
@@ -80,7 +80,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
wait_for_vue_resource
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
expect
(
page
).
to
have_content
(
'Testing'
)
end
end
...
...
@@ -90,7 +90,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
wait_for_vue_resource
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
click_link
'Delete board'
page
.
within
(
'.dropdown-title'
)
do
...
...
@@ -102,7 +102,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
click_button
board2
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
expect
(
page
).
not_to
have_content
(
board
.
name
)
expect
(
page
).
to
have_content
(
board2
.
name
)
end
...
...
@@ -111,7 +111,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it
'adds a list to the none default board'
do
click_button
board
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
click_link
board2
.
name
end
...
...
@@ -135,7 +135,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
click_button
board2
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
click_link
board
.
name
end
...
...
@@ -154,7 +154,7 @@ describe 'Multiple Issue Boards', feature: true, js: true do
it
'does not show action links'
do
click_button
board
.
name
page
.
within
(
'.
boards-title-holder .
dropdown-menu'
)
do
page
.
within
(
'.dropdown-menu'
)
do
expect
(
page
).
not_to
have_content
(
'Create new board'
)
expect
(
page
).
not_to
have_content
(
'Edit board name'
)
expect
(
page
).
not_to
have_content
(
'Delete board'
)
...
...
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