diff --git a/app/views/layouts/admin.html.erb b/app/views/layouts/admin.html.erb index 9364e066a..0cad84197 100644 --- a/app/views/layouts/admin.html.erb +++ b/app/views/layouts/admin.html.erb @@ -35,7 +35,7 @@ -
+
<%= side_menu %>
diff --git a/app/views/moderation/users/index.html.erb b/app/views/moderation/users/index.html.erb index b5dff141a..c7fcf502b 100644 --- a/app/views/moderation/users/index.html.erb +++ b/app/views/moderation/users/index.html.erb @@ -15,7 +15,7 @@

<%= page_entries_info @users %>

<% end %> - +
<% @users.each do |user| %> diff --git a/spec/features/admin/activity_spec.rb b/spec/features/admin/activity_spec.rb index 715c65f55..0bc1d7b6b 100644 --- a/spec/features/admin/activity_spec.rb +++ b/spec/features/admin/activity_spec.rb @@ -220,7 +220,7 @@ feature 'Admin activity' do visit moderation_users_path(name_or_email: user.username) - within(".admin-list") do + within("#moderation_users") do click_link 'Block' end diff --git a/spec/features/admin/banners_spec.rb b/spec/features/admin/banners_spec.rb index 9d329ceff..cad4c9f7a 100644 --- a/spec/features/admin/banners_spec.rb +++ b/spec/features/admin/banners_spec.rb @@ -67,14 +67,17 @@ feature 'Admin banners magement' do scenario 'Banners publication is listed on admin menu' do visit admin_root_path - within('#admin_menu') do + within('#side_menu') do expect(page).to have_link "Manage banners" end end scenario 'Publish a banner' do visit admin_root_path - click_link "Manage banners" + + within('#side_menu') do + click_link "Manage banners" + end click_link "Create banner" @@ -108,7 +111,10 @@ feature 'Admin banners magement' do post_ended_at: (Time.now + 10.days)) visit admin_root_path - click_link "Manage banners" + + within('#side_menu') do + click_link "Manage banners" + end click_link "Edit banner" diff --git a/spec/features/admin/feature_flags_spec.rb b/spec/features/admin/feature_flags_spec.rb index 63c4f1d64..55ea30837 100644 --- a/spec/features/admin/feature_flags_spec.rb +++ b/spec/features/admin/feature_flags_spec.rb @@ -9,7 +9,7 @@ feature 'Admin feature flags' do scenario 'Enabled features are listed on menu' do visit admin_root_path - within('#admin_menu') do + within('#side_menu') do expect(page).to have_link "Spending proposals" expect(page).to have_link "Hidden debates" end @@ -28,7 +28,7 @@ feature 'Admin feature flags' do visit admin_root_path - within('#admin_menu') do + within('#side_menu') do expect(page).not_to have_link "Spending proposals" end @@ -42,7 +42,7 @@ feature 'Admin feature flags' do visit admin_root_path - within('#admin_menu') do + within('#side_menu') do expect(page).not_to have_link "Spending proposals" end @@ -56,7 +56,7 @@ feature 'Admin feature flags' do visit admin_root_path - within('#admin_menu') do + within('#side_menu') do expect(page).to have_link "Spending proposals" end end diff --git a/spec/features/moderation/users_spec.rb b/spec/features/moderation/users_spec.rb index caace7d9c..053d29590 100644 --- a/spec/features/moderation/users_spec.rb +++ b/spec/features/moderation/users_spec.rb @@ -62,13 +62,13 @@ feature 'Moderate users' do fill_in 'name_or_email', with: 'Wanda' click_button 'Search' - within(".admin-list") do + within("#moderation_users") do expect(page).to have_content citizen.name expect(page).not_to have_content "Blocked" click_link 'Block' end - within(".admin-list") do + within("#moderation_users") do expect(page).to have_content citizen.name expect(page).to have_content "Blocked" end