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
Boxiang Sun
gitlab-ce
Commits
71eeb863
Commit
71eeb863
authored
Mar 09, 2017
by
George Andrinopoulos
Committed by
Rémy Coutable
Mar 09, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix wrong message on starred projects filtering
parent
71d371cf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
33 additions
and
10 deletions
+33
-10
app/views/dashboard/projects/starred.html.haml
app/views/dashboard/projects/starred.html.haml
+1
-1
changelogs/unreleased/28402-fix-starred-projects-filter-wrong-message-on-no-results.yml
...x-starred-projects-filter-wrong-message-on-no-results.yml
+4
-0
spec/features/dashboard/user_filters_projects_spec.rb
spec/features/dashboard/user_filters_projects_spec.rb
+28
-9
No files found.
app/views/dashboard/projects/starred.html.haml
View file @
71eeb863
...
@@ -6,7 +6,7 @@
...
@@ -6,7 +6,7 @@
-
if
@last_push
-
if
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
=
render
"events/event_last_push"
,
event:
@last_push
-
if
@projects
.
any?
-
if
@projects
.
any?
||
params
[
:filter_projects
]
=
render
'projects'
=
render
'projects'
-
else
-
else
%h3
You don't have starred projects yet
%h3
You don't have starred projects yet
...
...
changelogs/unreleased/28402-fix-starred-projects-filter-wrong-message-on-no-results.yml
0 → 100644
View file @
71eeb863
---
title
:
Fix wrong message on starred projects filtering
merge_request
:
author
:
George Andrinopoulos
spec/features/dashboard/user_filters_projects_spec.rb
View file @
71eeb863
require
'spec_helper'
require
'spec_helper'
describe
"Dashboard > User filters projects"
,
feature:
true
do
describe
'Dashboard > User filters projects'
,
:feature
do
let
(
:user
)
{
create
(
:user
)
}
let
(
:project
)
{
create
(
:project
,
name:
'Victorialand'
,
namespace:
user
.
namespace
)
}
let
(
:user2
)
{
create
(
:user
)
}
let
(
:project2
)
{
create
(
:project
,
name:
'Treasure'
,
namespace:
user2
.
namespace
)
}
before
do
project
.
team
<<
[
user
,
:master
]
login_as
(
user
)
end
describe
'filtering personal projects'
do
describe
'filtering personal projects'
do
before
do
before
do
user
=
create
(
:user
)
project
=
create
(
:project
,
name:
"Victorialand"
,
namespace:
user
.
namespace
)
project
.
team
<<
[
user
,
:master
]
user2
=
create
(
:user
)
project2
=
create
(
:project
,
name:
"Treasure"
,
namespace:
user2
.
namespace
)
project2
.
team
<<
[
user
,
:developer
]
project2
.
team
<<
[
user
,
:developer
]
login_as
(
user
)
visit
dashboard_projects_path
visit
dashboard_projects_path
end
end
it
'filters by projects "Owned by me"'
do
it
'filters by projects "Owned by me"'
do
click_link
"Owned by me"
click_link
'Owned by me'
expect
(
page
).
to
have_css
(
'.is-active'
,
text:
'Owned by me'
)
expect
(
page
).
to
have_css
(
'.is-active'
,
text:
'Owned by me'
)
expect
(
page
).
to
have_content
(
'Victorialand'
)
expect
(
page
).
to
have_content
(
'Victorialand'
)
expect
(
page
).
not_to
have_content
(
'Treasure'
)
expect
(
page
).
not_to
have_content
(
'Treasure'
)
end
end
end
end
describe
'filtering starred projects'
,
:js
do
before
do
user
.
toggle_star
(
project
)
visit
dashboard_projects_path
end
it
'returns message when starred projects fitler returns no results'
do
fill_in
'project-filter-form-field'
,
with:
'Beta\n'
expect
(
page
).
to
have_content
(
'No projects found'
)
expect
(
page
).
not_to
have_content
(
'You don\'t have starred projects yet'
)
end
end
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