Commit 3e28d04c authored by Annabel Dunstone's avatar Annabel Dunstone

Fix preferences_spec test

parent 630aeb31
...@@ -116,10 +116,6 @@ header { ...@@ -116,10 +116,6 @@ header {
padding-right: 0; padding-right: 0;
} }
@media (max-width: $screen-sm-max) {
padding-right: 30px;
}
.dropdown-menu { .dropdown-menu {
margin-top: -5px; margin-top: -5px;
} }
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.collapse-nav .collapse-nav
= render partial: 'layouts/collapse_button' = render partial: 'layouts/collapse_button'
- if current_user - 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' = image_tag avatar_icon(current_user, 60), alt: 'Profile', class: 'avatar avatar s36'
.username .username
= current_user.username = current_user.username
......
...@@ -54,7 +54,7 @@ describe 'Profile > Preferences', feature: true do ...@@ -54,7 +54,7 @@ describe 'Profile > Preferences', feature: true do
end end
end end
describe 'User changes their default dashboard' do describe 'User changes their default dashboard', js: true do
it 'creates a flash message' do it 'creates a flash message' do
select 'Starred Projects', from: 'user_dashboard' select 'Starred Projects', from: 'user_dashboard'
click_button 'Save' click_button 'Save'
...@@ -66,8 +66,10 @@ describe 'Profile > Preferences', feature: true do ...@@ -66,8 +66,10 @@ describe 'Profile > Preferences', feature: true do
select 'Starred Projects', from: 'user_dashboard' select 'Starred Projects', from: 'user_dashboard'
click_button 'Save' click_button 'Save'
click_link 'Dashboard' allowing_for_delay do
find('#logo').click
expect(page.current_path).to eq starred_dashboard_projects_path expect(page.current_path).to eq starred_dashboard_projects_path
end
click_link 'Your Projects' click_link 'Your Projects'
expect(page.current_path).to eq dashboard_projects_path expect(page.current_path).to eq dashboard_projects_path
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment