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
5982dcdd
Commit
5982dcdd
authored
Apr 20, 2018
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix sidebar spec
parent
5325b2fe
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
app/assets/javascripts/boards/components/issue_card_inner.js
app/assets/javascripts/boards/components/issue_card_inner.js
+1
-1
spec/features/boards/sidebar_spec.rb
spec/features/boards/sidebar_spec.rb
+7
-7
No files found.
app/assets/javascripts/boards/components/issue_card_inner.js
View file @
5982dcdd
...
...
@@ -179,7 +179,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
v-if="showLabelFooter"
>
<button
class="
label
color-label has-tooltip"
class="
badge
color-label has-tooltip"
v-for="label in issue.labels"
type="button"
v-if="showLabel(label)"
...
...
spec/features/boards/sidebar_spec.rb
View file @
5982dcdd
...
...
@@ -246,7 +246,7 @@ describe 'Issue Boards', :js do
wait_for_requests
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.
label
'
,
count:
2
)
expect
(
page
).
to
have_selector
(
'.
badge
'
,
count:
2
)
expect
(
page
).
to
have_content
(
development
.
title
)
expect
(
page
).
to
have_content
(
stretch
.
title
)
end
...
...
@@ -268,12 +268,12 @@ describe 'Issue Boards', :js do
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.
label
'
,
count:
3
)
expect
(
page
).
to
have_selector
(
'.
badge
'
,
count:
3
)
expect
(
page
).
to
have_content
(
bug
.
title
)
end
end
expect
(
card
).
to
have_selector
(
'.
label
'
,
count:
3
)
expect
(
card
).
to
have_selector
(
'.
badge
'
,
count:
3
)
expect
(
card
).
to
have_content
(
bug
.
title
)
end
...
...
@@ -293,13 +293,13 @@ describe 'Issue Boards', :js do
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.
label
'
,
count:
4
)
expect
(
page
).
to
have_selector
(
'.
badge
'
,
count:
4
)
expect
(
page
).
to
have_content
(
bug
.
title
)
expect
(
page
).
to
have_content
(
regression
.
title
)
end
end
expect
(
card
).
to
have_selector
(
'.
label
'
,
count:
4
)
expect
(
card
).
to
have_selector
(
'.
badge
'
,
count:
4
)
expect
(
card
).
to
have_content
(
bug
.
title
)
expect
(
card
).
to
have_content
(
regression
.
title
)
end
...
...
@@ -321,12 +321,12 @@ describe 'Issue Boards', :js do
find
(
'.dropdown-menu-close-icon'
).
click
page
.
within
(
'.value'
)
do
expect
(
page
).
to
have_selector
(
'.
label
'
,
count:
1
)
expect
(
page
).
to
have_selector
(
'.
badge
'
,
count:
1
)
expect
(
page
).
not_to
have_content
(
stretch
.
title
)
end
end
expect
(
card
).
to
have_selector
(
'.
label
'
,
count:
1
)
expect
(
card
).
to
have_selector
(
'.
badge
'
,
count:
1
)
expect
(
card
).
not_to
have_content
(
stretch
.
title
)
end
...
...
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