Add filters by project, author, type, and action to task queue page list

2 files changed, 115 insertions, 24 deletions

diff --git a/features/dashboard/task_queue.feature b/features/dashboard/task_queue.feature
index 42b4a86e498..8972a148289 100644
--- a/features/dashboard/task_queue.feature
+++ b/features/dashboard/task_queue.feature
@@ -4,6 +4,9 @@ Feature: Dashboard Task Queue
     Given I sign in as a user
     And I own project "Shop"
     And "John Doe" is a developer of project "Shop"
+    And "Mary Jane" is a developer of project "Shop"
+    And "Mary Jane" owns private project "Enterprise"
+    And I am a developer of project "Enterprise"
     And I have pending tasks
     And I visit dashboard task queue page
 
@@ -13,3 +16,23 @@ Feature: Dashboard Task Queue
     And I mark the pending task as done
     And I click on the "Done" tab
     Then I should see all tasks marked as done
+
+  @javascript
+    Scenario: I filter by project
+      Given I filter by "Enterprise"
+      Then I should not see tasks
+
+  @javascript
+    Scenario: I filter by author
+      Given I filter by "John Doe"
+      Then I should not see tasks related to "Mary Jane" in the list
+
+  @javascript
+    Scenario: I filter by type
+      Given I filter by "Issue"
+      Then I should not see tasks related to "Merge Requests" in the list
+
+  @javascript
+    Scenario: I filter by action
+      Given I filter by "Mentioned"
+      Then I should not see tasks related to "Assignments" in the list
diff --git a/features/steps/dashboard/task_queue.rb b/features/steps/dashboard/task_queue.rb
index 8695dd5cfb1..53920f585dc 100644
--- a/features/steps/dashboard/task_queue.rb
+++ b/features/steps/dashboard/task_queue.rb
@@ -3,58 +3,126 @@ class Spinach::Features::DashboardTaskQueue < Spinach::FeatureSteps
   include SharedPaths
   include SharedProject
   include SharedUser
+  include Select2Helper
 
   step '"John Doe" is a developer of project "Shop"' do
     project.team << [john_doe, :developer]
   end
 
+  step 'I am a developer of project "Enterprise"' do
+    enterprise.team << [current_user, :developer]
+  end
+
+  step '"Mary Jane" is a developer of project "Shop"' do
+    project.team << [john_doe, :developer]
+  end
+
   step 'I have pending tasks' do
-    create(:task, user: current_user, project: project, author: john_doe, target: assigned_issue, action: Task::ASSIGNED)
+    create(:task, user: current_user, project: project, author: mary_jane, target: issue, action: Task::MENTIONED)
+    create(:task, user: current_user, project: project, author: john_doe, target: issue, action: Task::ASSIGNED)
+    note = create(:note, author: john_doe, noteable: issue, note: "#{current_user.to_reference} Wdyt?")
+    create(:task, user: current_user, project: project, author: john_doe, target: issue, action: Task::MENTIONED, note: note)
+    create(:task, user: current_user, project: project, author: john_doe, target: merge_request, action: Task::ASSIGNED)
   end
 
   step 'I should see pending tasks assigned to me' do
-    expect(page).to have_link 'Tasks (1)'
-    expect(page).to have_link 'Done (0)'
-
-    page.within('.tasks') do
-      expect(page).to have_content project.name_with_namespace
-      expect(page).to have_content "John Doe assigned issue ##{assigned_issue.iid}"
-      expect(page).to have_content(assigned_issue.title[0..10])
-      expect(page).to have_link 'Done'
-    end
+    expect(page).to have_content 'Tasks 4'
+    expect(page).to have_content 'Done 0'
+
+    expect(page).to have_link project.name_with_namespace
+    should_see_task(1, "John Doe assigned merge request ##{merge_request.iid}", merge_request.title)
+    should_see_task(2, "John Doe mentioned on issue ##{issue.iid}", "#{current_user.to_reference} Wdyt?")
+    should_see_task(3, "John Doe assigned issue ##{issue.iid}", issue.title)
+    should_see_task(4, "Mary Jane mentioned on issue ##{issue.iid}", issue.title)
   end
 
   step 'I mark the pending task as done' do
-    click_link 'Done'
+    page.within('.task:nth-child(1)') do
+      click_link 'Done'
+    end
 
     expect(page).to have_content 'Task was successfully marked as done.'
-    expect(page).to have_link 'Tasks (0)'
-    expect(page).to have_link 'Done (1)'
-    expect(page).to have_content 'No tasks to show'
+    expect(page).to have_content 'Tasks 3'
+    expect(page).to have_content 'Done 1'
+    should_not_see_task "John Doe assigned merge request ##{merge_request.iid}"
   end
 
   step 'I click on the "Done" tab' do
-    click_link 'Done (1)'
+    click_link 'Done 1'
   end
 
   step 'I should see all tasks marked as done' do
-    page.within('.tasks') do
-      expect(page).to have_content project.name_with_namespace
-      expect(page).to have_content "John Doe assigned issue ##{assigned_issue.iid}"
-      expect(page).to have_content(assigned_issue.title[0..10])
-      expect(page).not_to have_link 'Done'
+    expect(page).to have_link project.name_with_namespace
+    should_see_task(1, "John Doe assigned merge request ##{merge_request.iid}", merge_request.title, false)
+  end
+
+  step 'I filter by "Enterprise"' do
+    select2(enterprise.id, from: "#project_id")
+  end
+
+  step 'I filter by "John Doe"' do
+    select2(john_doe.id, from: "#author_id")
+  end
+
+  step 'I filter by "Issue"' do
+    select2('Issue', from: "#type")
+  end
+
+  step 'I filter by "Mentioned"' do
+    select2("#{Task::MENTIONED}", from: '#action_id')
+  end
+
+  step 'I should not see tasks' do
+    expect(page).to have_content 'No tasks to show'
+  end
+
+  step 'I should not see tasks related to "Mary Jane" in the list' do
+    should_not_see_task "Mary Jane mentioned on issue ##{issue.iid}"
+  end
+
+  step 'I should not see tasks related to "Merge Requests" in the list' do
+    should_not_see_task "John Doe assigned merge request ##{merge_request.iid}"
+  end
+
+  step 'I should not see tasks related to "Assignments" in the list' do
+    should_not_see_task "John Doe assigned merge request ##{merge_request.iid}"
+    should_not_see_task "John Doe assigned issue ##{issue.iid}"
+  end
+
+  def should_see_task(position, title, body, pending = true)
+    page.within(".task:nth-child(#{position})") do
+      expect(page).to have_content title
+      expect(page).to have_content body
+
+      if pending
+        expect(page).to have_link 'Done'
+      else
+        expect(page).to_not have_link 'Done'
+      end
     end
   end
 
-  def assigned_issue
-    @assigned_issue ||= create(:issue, assignee: current_user, project: project)
+  def should_not_see_task(title)
+    expect(page).not_to have_content title
   end
 
   def john_doe
     @john_doe ||= user_exists("John Doe", { username: "john_doe" })
   end
 
-  def project
-    @project ||= create(:project, name: "Shop")
+  def mary_jane
+    @mary_jane ||= user_exists("Mary Jane", { username: "mary_jane" })
+  end
+
+  def enterprise
+    @enterprise ||= Project.find_by(name: 'Enterprise')
+  end
+
+  def issue
+    @issue ||= create(:issue, assignee: current_user, project: project)
+  end
+
+  def merge_request
+    @merge_request ||= create(:merge_request, assignee: current_user, source_project: project)
   end
 end