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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
iv
gitlab-ce
Commits
fd090a2f
Commit
fd090a2f
authored
Apr 02, 2016
by
Rubén Dávila
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix bug related to filtering Issues by Label/Milestone.
This problem only was affecting the dev env.
parent
09b7b766
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
1 deletion
+28
-1
app/models/concerns/issuable.rb
app/models/concerns/issuable.rb
+1
-1
features/dashboard/dashboard.feature
features/dashboard/dashboard.feature
+8
-0
features/steps/dashboard/dashboard.rb
features/steps/dashboard/dashboard.rb
+19
-0
No files found.
app/models/concerns/issuable.rb
View file @
fd090a2f
...
...
@@ -42,7 +42,7 @@ module Issuable
scope
:join_project
,
->
{
joins
(
:project
)
}
scope
:references_project
,
->
{
references
(
:project
)
}
scope
:non_archived
,
->
{
join_project
.
merge
(
Project
.
non_archived
.
only
(
:where
)
)
}
scope
:non_archived
,
->
{
join_project
.
where
(
projects:
{
archived:
false
}
)
}
delegate
:name
,
:email
,
...
...
features/dashboard/dashboard.feature
View file @
fd090a2f
...
...
@@ -6,6 +6,7 @@ Feature: Dashboard
And
project
"Shop"
has push event
And
project
"Shop"
has CI enabled
And
project
"Shop"
has CI build
And project "Shop" has labels
:
"bug",
"feature",
"enhancement"
And
I visit dashboard page
Scenario
:
I
should see projects list
...
...
@@ -50,6 +51,13 @@ Feature: Dashboard
And
I visit dashboard issues page
Then
The list should be sorted by
"Oldest updated"
@javascript
Scenario
:
Filtering Issues by label
Given
project
"Shop"
has issue
"Bugfix1"
with label
"feature"
When
I visit dashboard issues page
And
I filter the list by label
"feature"
Then
I should see
"Bugfix1"
in issues list
@javascript
Scenario
:
Visiting Project's issues after sorting
Given
I visit dashboard issues page
...
...
features/steps/dashboard/dashboard.rb
View file @
fd090a2f
...
...
@@ -87,4 +87,23 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
step
'I should see 1 project at group list'
do
expect
(
find
(
'span.last_activity/span'
)).
to
have_content
(
'1'
)
end
step
'I filter the list by label "feature"'
do
page
.
within
".labels-filter"
do
find
(
'.dropdown'
).
click
click_link
"feature"
end
end
step
'I should see "Bugfix1" in issues list'
do
page
.
within
"ul.content-list"
do
expect
(
page
).
to
have_content
"Bugfix1"
end
end
step
'project "Shop" has issue "Bugfix1" with label "feature"'
do
project
=
Project
.
find_by
(
name:
"Shop"
)
issue
=
create
(
:issue
,
title:
"Bugfix1"
,
project:
project
,
assignee:
current_user
)
issue
.
labels
<<
project
.
labels
.
find_by
(
title:
'feature'
)
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