summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-10 15:08:13 -0500
committerAnnabel Dunstone <annabel.dunstone@gmail.com>2016-06-10 15:08:13 -0500
commit3e28d04cced2c417ee9144a17866e0cc2c910a6c (patch)
treec39115f7bfe5127adb0085d7182bbc1388d20f6e
parent630aeb31eb7728789d1f7659ec0e12ea5a5fd59c (diff)
downloadgitlab-ce-3e28d04cced2c417ee9144a17866e0cc2c910a6c.tar.gz
Fix preferences_spec test18417-nav-offscreen
-rw-r--r--app/assets/stylesheets/framework/header.scss4
-rw-r--r--app/views/layouts/_page.html.haml2
-rw-r--r--spec/features/profiles/preferences_spec.rb8
3 files changed, 6 insertions, 8 deletions
diff --git a/app/assets/stylesheets/framework/header.scss b/app/assets/stylesheets/framework/header.scss
index c07b2753f4d..63996ea44f6 100644
--- a/app/assets/stylesheets/framework/header.scss
+++ b/app/assets/stylesheets/framework/header.scss
@@ -116,10 +116,6 @@ header {
padding-right: 0;
}
- @media (max-width: $screen-sm-max) {
- padding-right: 30px;
- }
-
.dropdown-menu {
margin-top: -5px;
}
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 1a721b0c296..dbf425d46c7 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -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
diff --git a/spec/features/profiles/preferences_spec.rb b/spec/features/profiles/preferences_spec.rb
index 8f645438cff..787bf42d048 100644
--- a/spec/features/profiles/preferences_spec.rb
+++ b/spec/features/profiles/preferences_spec.rb
@@ -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