1 files changed, 35 insertions, 6 deletions

diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index 7b9d4534ada..0de0f93089a 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -1,10 +1,10 @@
 require 'rails_helper'
 
 feature 'Issue Sidebar', feature: true do
-  include WaitForAjax
   include MobileHelpers
 
-  let(:project) { create(:project, :public) }
+  let(:group) { create(:group, :nested) }
+  let(:project) { create(:project, :public, namespace: group) }
   let(:issue) { create(:issue, project: project) }
   let!(:user) { create(:user)}
   let!(:label) { create(:label, project: project, title: 'bug') }
@@ -42,6 +42,21 @@ feature 'Issue Sidebar', feature: true do
         expect(page).to have_content(user2.name)
       end
     end
+
+    it 'assigns yourself' do
+      find('.block.assignee .dropdown-menu-toggle').click
+
+      click_button 'assign yourself'
+
+      wait_for_ajax
+
+      find('.block.assignee .edit-link').click
+
+      page.within '.dropdown-menu-user' do
+        expect(page.find('.dropdown-header')).to be_visible
+        expect(page.find('.dropdown-menu-user-link.is-active')).to have_content(user.name)
+      end
+    end
   end
 
   context 'as a allowed user' do
@@ -56,10 +71,12 @@ feature 'Issue Sidebar', feature: true do
         # Resize the window
         resize_screen_sm
         # Make sure the sidebar is collapsed
+        find(sidebar_selector)
         expect(page).to have_css(sidebar_selector)
         # Once is collapsed let's open the sidebard and reload
         open_issue_sidebar
         refresh
+        find(sidebar_selector)
         expect(page).to have_css(sidebar_selector)
         # Restore the window size as it was including the sidebar
         restore_window_size
@@ -120,6 +137,20 @@ feature 'Issue Sidebar', feature: true do
     end
   end
 
+  context 'as a allowed mobile user', js: true do
+    before do
+      project.team << [user, :developer]
+      resize_screen_xs
+      visit_issue(project, issue)
+    end
+
+    context 'mobile sidebar' do
+      it 'collapses the sidebar for small screens' do
+        expect(page).not_to have_css('aside.right-sidebar.right-sidebar-collapsed')
+      end
+    end
+  end
+
   context 'as a guest' do
     before do
       project.team << [user, :guest]
@@ -136,9 +167,7 @@ feature 'Issue Sidebar', feature: true do
   end
 
   def open_issue_sidebar
-    page.within('aside.right-sidebar.right-sidebar-collapsed') do
-      find('.js-sidebar-toggle').click
-      sleep 1
-    end
+    find('aside.right-sidebar.right-sidebar-collapsed .js-sidebar-toggle').trigger('click')
+    find('aside.right-sidebar.right-sidebar-expanded')
   end
 end