diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-07 17:00:44 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-07 17:00:44 +0000 |
commit | 7d315aecfbd807bcdb9131151e86e37c90603f70 (patch) | |
tree | ac55cb1545b58de0f81dd6184d9ce9c797fbbc62 /spec | |
parent | 99913b3d2ce1657a9521daa5504ee1dee002a286 (diff) | |
parent | ef37b57f1f5089420997c6092921e1d9516b03b4 (diff) | |
download | gitlab-ce-7d315aecfbd807bcdb9131151e86e37c90603f70.tar.gz |
Merge branch '18013-compact-sidebar' into 'master'
Implement compact side nav
## What does this MR do?
Implements new compact nav design
Note- new navbar icons are in a separate MR (https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4268)
## What are the relevant issue numbers?
Closes #18013
## Screenshots (if relevant)
![Screen_Shot_2016-06-02_at_3.20.37_PM](/uploads/d31bd17ae47743f1a20d7429b4396e84/Screen_Shot_2016-06-02_at_3.20.37_PM.png)
![Screen_Shot_2016-06-02_at_3.20.43_PM](/uploads/d03a080a57707b6a2161127f3904fcd5/Screen_Shot_2016-06-02_at_3.20.43_PM.png)
cc @dzaporozhets
See merge request !4447
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/admin/admin_users_spec.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/admin/admin_users_spec.rb b/spec/features/admin/admin_users_spec.rb index b72ad405479..1cb709c1de3 100644 --- a/spec/features/admin/admin_users_spec.rb +++ b/spec/features/admin/admin_users_spec.rb @@ -144,8 +144,8 @@ describe "Admin::Users", feature: true do before { click_link 'Impersonate' } it 'logs in as the user when impersonate is clicked' do - page.within '.sidebar-user .username' do - expect(page).to have_content(another_user.username) + page.within '.sidebar-wrapper' do + expect(page.find('.sidebar-user')['data-user']).to eql(another_user.username) end end @@ -158,8 +158,8 @@ describe "Admin::Users", feature: true do it 'can log out of impersonated user back to original user' do find(:css, 'li.impersonation a').click - page.within '.sidebar-user .username' do - expect(page).to have_content(@user.username) + page.within '.sidebar-wrapper' do + expect(page.find('.sidebar-user')['data-user']).to eql(@user.username) end end |