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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
5f53ca69
Commit
5f53ca69
authored
Apr 14, 2016
by
Arinde Eniola
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix failing tests
parent
6745e58f
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
4 deletions
+14
-4
app/views/shared/_label_row.html.haml
app/views/shared/_label_row.html.haml
+5
-3
app/views/shared/_labels_row.html.haml
app/views/shared/_labels_row.html.haml
+3
-0
app/views/shared/issuable/_filter.html.haml
app/views/shared/issuable/_filter.html.haml
+1
-1
features/project/issues/filter_labels.feature
features/project/issues/filter_labels.feature
+1
-0
features/steps/project/issues/filter_labels.rb
features/steps/project/issues/filter_labels.rb
+4
-0
No files found.
app/views/shared/_label_row.html.haml
View file @
5f53ca69
-
labels
.
each
do
|
l
|
%span
.label-row
%span
.label-row
%span
.label-name
=
link_to_label
(
l
,
tooltip:
false
)
=
link_to_label
(
label
,
tooltip:
false
)
\ No newline at end of file
%span
.prepend-left-10
=
markdown
(
label
.
description
,
pipeline: :single_line
)
\ No newline at end of file
app/views/shared/_labels_row.html.haml
0 → 100644
View file @
5f53ca69
-
labels
.
each
do
|
l
|
%span
.label-row
=
link_to_label
(
l
,
tooltip:
false
)
\ No newline at end of file
app/views/shared/issuable/_filter.html.haml
View file @
5f53ca69
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
.gray-content-block.second-block.filtered-labels
.gray-content-block.second-block.filtered-labels
-
if
@labels
-
if
@labels
=
render
"shared/label_row"
,
labels:
@labels
=
render
"shared/label
s
_row"
,
labels:
@labels
:javascript
:javascript
new
UsersSelect
();
new
UsersSelect
();
...
...
features/project/issues/filter_labels.feature
View file @
5f53ca69
...
@@ -12,6 +12,7 @@ Feature: Project Issues Filter Labels
...
@@ -12,6 +12,7 @@ Feature: Project Issues Filter Labels
@javascript
@javascript
Scenario
:
I
filter by one label
Scenario
:
I
filter by one label
Given
I click link
"bug"
Given
I click link
"bug"
And
I click
"dropdown close button"
Then
I should see
"Bugfix1"
in issues list
Then
I should see
"Bugfix1"
in issues list
And
I should see
"Bugfix2"
in issues list
And
I should see
"Bugfix2"
in issues list
And
I should not see
"Feature1"
in issues list
And
I should not see
"Feature1"
in issues list
...
...
features/steps/project/issues/filter_labels.rb
View file @
5f53ca69
...
@@ -32,6 +32,10 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
...
@@ -32,6 +32,10 @@ class Spinach::Features::ProjectIssuesFilterLabels < Spinach::FeatureSteps
page
.
find
(
'.js-label-select'
).
click
page
.
find
(
'.js-label-select'
).
click
sleep
0.5
sleep
0.5
execute_script
(
"$('.dropdown-menu-labels li:contains(
\"
bug
\"
) a').click()"
)
execute_script
(
"$('.dropdown-menu-labels li:contains(
\"
bug
\"
) a').click()"
)
end
step
'I click "dropdown close button"'
do
page
.
first
(
'.labels-filter .dropdown-title .dropdown-menu-close-icon'
).
click
sleep
2
sleep
2
end
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