Fix filter by my reaction is not working

3 files changed, 60 insertions, 1 deletions

diff --git a/app/finders/issuable_finder.rb b/app/finders/issuable_finder.rb
index 24c07f3dc70..b46ec5e5350 100644
--- a/app/finders/issuable_finder.rb
+++ b/app/finders/issuable_finder.rb
@@ -36,6 +36,7 @@ class IssuableFinder
     iids
     label_name
     milestone_title
+    my_reaction_emoji
     non_archived
     project_id
     scope
diff --git a/changelogs/unreleased/fix-filter-by-my-reaction.yml b/changelogs/unreleased/fix-filter-by-my-reaction.yml
new file mode 100644
index 00000000000..8bf91ddf893
--- /dev/null
+++ b/changelogs/unreleased/fix-filter-by-my-reaction.yml
@@ -0,0 +1,5 @@
+---
+title: Fix filter by my reaction is not working
+merge_request: 15345
+author: Hiroyuki Sato
+type: fixed
diff --git a/spec/controllers/concerns/issuable_collections_spec.rb b/spec/controllers/concerns/issuable_collections_spec.rb
index cd3bf785d34..d7825364ed5 100644
--- a/spec/controllers/concerns/issuable_collections_spec.rb
+++ b/spec/controllers/concerns/issuable_collections_spec.rb
@@ -12,12 +12,14 @@ describe IssuableCollections do
 
     controller = klass.new
 
-    allow(controller).to receive(:params).and_return(state: 'opened')
+    allow(controller).to receive(:params).and_return(ActionController::Parameters.new(params))
 
     controller
   end
 
   describe '#page_count_for_relation' do
+    let(:params) { { state: 'opened' } }
+
     it 'returns the number of pages' do
       relation = double(:relation, limit_value: 20)
       pages = controller.send(:page_count_for_relation, relation, 28)
@@ -25,4 +27,55 @@ describe IssuableCollections do
       expect(pages).to eq(2)
     end
   end
+
+  describe '#filter_params' do
+    let(:params) do
+      {
+        assignee_id: '1',
+        assignee_username: 'user1',
+        author_id: '2',
+        author_username: 'user2',
+        authorized_only: 'true',
+        due_date: '2017-01-01',
+        group_id: '3',
+        iids: '4',
+        label_name: 'foo',
+        milestone_title: 'bar',
+        my_reaction_emoji: 'thumbsup',
+        non_archived: 'true',
+        project_id: '5',
+        scope: 'all',
+        search: 'baz',
+        sort: 'priority',
+        state: 'opened',
+        invalid_param: 'invalid_param'
+      }
+    end
+
+    it 'filters params' do
+      allow(controller).to receive(:cookies).and_return({})
+
+      filtered_params = controller.send(:filter_params)
+
+      expect(filtered_params).to eq({
+        'assignee_id' => '1',
+        'assignee_username' => 'user1',
+        'author_id' => '2',
+        'author_username' => 'user2',
+        'authorized_only' => 'true',
+        'due_date' => '2017-01-01',
+        'group_id' => '3',
+        'iids' => '4',
+        'label_name' => 'foo',
+        'milestone_title' => 'bar',
+        'my_reaction_emoji' => 'thumbsup',
+        'non_archived' => 'true',
+        'project_id' => '5',
+        'scope' => 'all',
+        'search' => 'baz',
+        'sort' => 'priority',
+        'state' => 'opened'
+      })
+    end
+  end
 end