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
Tatuya Kamada
gitlab-ce
Commits
3e28d04c
Commit
3e28d04c
authored
Jun 10, 2016
by
Annabel Dunstone
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix preferences_spec test
parent
630aeb31
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
8 deletions
+6
-8
app/assets/stylesheets/framework/header.scss
app/assets/stylesheets/framework/header.scss
+0
-4
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+1
-1
spec/features/profiles/preferences_spec.rb
spec/features/profiles/preferences_spec.rb
+5
-3
No files found.
app/assets/stylesheets/framework/header.scss
View file @
3e28d04c
...
...
@@ -116,10 +116,6 @@ header {
padding-right
:
0
;
}
@media
(
max-width
:
$screen-sm-max
)
{
padding-right
:
30px
;
}
.dropdown-menu
{
margin-top
:
-5px
;
}
...
...
app/views/layouts/_page.html.haml
View file @
3e28d04c
...
...
@@ -11,7 +11,7 @@
.collapse-nav
=
render
partial:
'layouts/collapse_button'
-
if
current_user
=
link_to
current_user
,
class:
'sidebar-user'
,
title:
"Profile"
do
=
link_to
current_user
,
class:
'sidebar-user'
,
title:
"Profile"
,
data:
{
user:
current_user
.
username
}
do
=
image_tag
avatar_icon
(
current_user
,
60
),
alt:
'Profile'
,
class:
'avatar avatar s36'
.username
=
current_user
.
username
...
...
spec/features/profiles/preferences_spec.rb
View file @
3e28d04c
...
...
@@ -54,7 +54,7 @@ describe 'Profile > Preferences', feature: true do
end
end
describe
'User changes their default dashboard'
do
describe
'User changes their default dashboard'
,
js:
true
do
it
'creates a flash message'
do
select
'Starred Projects'
,
from:
'user_dashboard'
click_button
'Save'
...
...
@@ -66,8 +66,10 @@ describe 'Profile > Preferences', feature: true do
select
'Starred Projects'
,
from:
'user_dashboard'
click_button
'Save'
click_link
'Dashboard'
expect
(
page
.
current_path
).
to
eq
starred_dashboard_projects_path
allowing_for_delay
do
find
(
'#logo'
).
click
expect
(
page
.
current_path
).
to
eq
starred_dashboard_projects_path
end
click_link
'Your Projects'
expect
(
page
.
current_path
).
to
eq
dashboard_projects_path
...
...
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