1 files changed, 49 insertions, 40 deletions

diff --git a/spec/features/dashboard/issues_spec.rb b/spec/features/dashboard/issues_spec.rb
index 7a132dba1e9..2cea6b1563e 100644
--- a/spec/features/dashboard/issues_spec.rb
+++ b/spec/features/dashboard/issues_spec.rb
@@ -2,66 +2,75 @@ require 'spec_helper'
 
 RSpec.describe 'Dashboard Issues', feature: true do
   let(:current_user) { create :user }
-  let(:public_project) { create(:empty_project, :public) }
-  let(:project) do
-    create(:empty_project) do |project|
-      project.team << [current_user, :master]
-    end
-  end
-
+  let!(:public_project) { create(:empty_project, :public) }
+  let(:project) { create(:empty_project) }
+  let(:project_with_issues_disabled) { create(:empty_project, :issues_disabled) }
   let!(:authored_issue) { create :issue, author: current_user, project: project }
   let!(:authored_issue_on_public_project) { create :issue, author: current_user, project: public_project }
   let!(:assigned_issue) { create :issue, assignees: [current_user], project: project }
   let!(:other_issue) { create :issue, project: project }
 
   before do
+    [project, project_with_issues_disabled].each { |project| project.team << [current_user, :master] }
     login_as(current_user)
-
     visit issues_dashboard_path(assignee_id: current_user.id)
   end
 
-  it 'shows issues assigned to current user' do
-    expect(page).to have_content(assigned_issue.title)
-    expect(page).not_to have_content(authored_issue.title)
-    expect(page).not_to have_content(other_issue.title)
-  end
+  describe 'issues' do
+    it 'shows issues assigned to current user' do
+      expect(page).to have_content(assigned_issue.title)
+      expect(page).not_to have_content(authored_issue.title)
+      expect(page).not_to have_content(other_issue.title)
+    end
 
-  it 'shows checkmark when unassigned is selected for assignee', js: true do
-    find('.js-assignee-search').click
-    find('li', text: 'Unassigned').click
-    find('.js-assignee-search').click
+    it 'shows checkmark when unassigned is selected for assignee', js: true do
+      find('.js-assignee-search').click
+      find('li', text: 'Unassigned').click
+      find('.js-assignee-search').click
 
-    expect(find('li[data-user-id="0"] a.is-active')).to be_visible
-  end
+      expect(find('li[data-user-id="0"] a.is-active')).to be_visible
+    end
+
+    it 'shows issues when current user is author', js: true do
+      find('#assignee_id', visible: false).set('')
+      find('.js-author-search', match: :first).click
 
-  it 'shows issues when current user is author', js: true do
-    find('#assignee_id', visible: false).set('')
-    find('.js-author-search', match: :first).click
+      expect(find('li[data-user-id="null"] a.is-active')).to be_visible
 
-    expect(find('li[data-user-id="null"] a.is-active')).to be_visible
+      find('.dropdown-menu-author li a', match: :first, text: current_user.to_reference).click
+      find('.js-author-search', match: :first).click
 
-    find('.dropdown-menu-author li a', match: :first, text: current_user.to_reference).click
-    find('.js-author-search', match: :first).click
+      page.within '.dropdown-menu-user' do
+        expect(find('.dropdown-menu-author li a.is-active', match: :first, text: current_user.to_reference)).to be_visible
+      end
 
-    page.within '.dropdown-menu-user' do
-      expect(find('.dropdown-menu-author li a.is-active', match: :first, text: current_user.to_reference)).to be_visible
+      expect(page).to have_content(authored_issue.title)
+      expect(page).to have_content(authored_issue_on_public_project.title)
+      expect(page).not_to have_content(assigned_issue.title)
+      expect(page).not_to have_content(other_issue.title)
     end
 
-    expect(page).to have_content(authored_issue.title)
-    expect(page).to have_content(authored_issue_on_public_project.title)
-    expect(page).not_to have_content(assigned_issue.title)
-    expect(page).not_to have_content(other_issue.title)
-  end
+    it 'shows all issues' do
+      click_link('Reset filters')
 
-  it 'shows all issues' do
-    click_link('Reset filters')
+      expect(page).to have_content(authored_issue.title)
+      expect(page).to have_content(authored_issue_on_public_project.title)
+      expect(page).to have_content(assigned_issue.title)
+      expect(page).to have_content(other_issue.title)
+    end
 
-    expect(page).to have_content(authored_issue.title)
-    expect(page).to have_content(authored_issue_on_public_project.title)
-    expect(page).to have_content(assigned_issue.title)
-    expect(page).to have_content(other_issue.title)
+    it_behaves_like "it has an RSS button with current_user's RSS token"
+    it_behaves_like "an autodiscoverable RSS feed with current_user's RSS token"
   end
 
-  it_behaves_like "it has an RSS button with current_user's private token"
-  it_behaves_like "an autodiscoverable RSS feed with current_user's private token"
+  describe 'new issue dropdown' do
+    it 'shows projects only with issues feature enabled', js: true do
+      find('.new-project-item-select-button').trigger('click')
+
+      page.within('.select2-results') do
+        expect(page).to have_content(project.name_with_namespace)
+        expect(page).not_to have_content(project_with_issues_disabled.name_with_namespace)
+      end
+    end
+  end
 end