diff --git a/spec/finders/issues_finder_spec.rb b/spec/finders/issues_finder_spec.rb
index 7489e56f423..06e247aea61 100644
--- a/spec/finders/issues_finder_spec.rb
+++ b/spec/finders/issues_finder_spec.rb
@@ -5,9 +5,10 @@ describe IssuesFinder do
   let(:user2) { create :user }
   let(:project1) { create(:project) }
   let(:project2) { create(:project) }
-  let(:issue1) { create(:issue, assignee: user, project: project1) }
-  let(:issue2) { create(:issue, assignee: user, project: project2) }
-  let(:issue3) { create(:issue, assignee: user2, project: project2) }
+  let(:milestone) { create(:milestone, project: project1) }
+  let(:issue1) { create(:issue, author: user, assignee: user, project: project1, milestone: milestone) }
+  let(:issue2) { create(:issue, author: user, assignee: user, project: project2) }
+  let(:issue3) { create(:issue, author: user2, assignee: user2, project: project2) }
 
   before do
     project1.team << [user, :master]
@@ -22,37 +23,59 @@ describe IssuesFinder do
       issue3
     end
 
-    it 'should filter by all' do
-      params = { scope: "all", state: 'opened' }
-      issues = IssuesFinder.new.execute(user, params)
-      issues.size.should == 3
+    context 'scope: all' do
+      it 'should filter by all' do
+        params = { scope: "all", state: 'opened' }
+        issues = IssuesFinder.new.execute(user, params)
+        issues.size.should == 3
+      end
+
+      it 'should filter by assignee id' do
+        params = { scope: "all", assignee_id: user.id, state: 'opened' }
+        issues = IssuesFinder.new.execute(user, params)
+        issues.size.should == 2
+      end
+
+      it 'should filter by author id' do
+        params = { scope: "all", author_id: user2.id, state: 'opened' }
+        issues = IssuesFinder.new.execute(user, params)
+        issues.should == [issue3]
+      end
+
+      it 'should filter by milestone id' do
+        params = { scope: "all", milestone_id: milestone.id, state: 'opened' }
+        issues = IssuesFinder.new.execute(user, params)
+        issues.should == [issue1]
+      end
+
+      it 'should be empty for unauthorized user' do
+        params = { scope: "all", state: 'opened' }
+        issues = IssuesFinder.new.execute(nil, params)
+        issues.size.should be_zero
+      end
+
+      it 'should not include unauthorized issues' do
+        params = { scope: "all", state: 'opened' }
+        issues = IssuesFinder.new.execute(user2, params)
+        issues.size.should == 2
+        issues.should_not include(issue1)
+        issues.should include(issue2)
+        issues.should include(issue3)
+      end
     end
 
-    it 'should filter by assignee' do
-      params = { scope: "assigned-to-me", state: 'opened' }
-      issues = IssuesFinder.new.execute(user, params)
-      issues.size.should == 2
-    end
+    context 'personal scope' do
+      it 'should filter by assignee' do
+        params = { scope: "assigned-to-me", state: 'opened' }
+        issues = IssuesFinder.new.execute(user, params)
+        issues.size.should == 2
+      end
 
-    it 'should filter by project' do
-      params = { scope: "assigned-to-me", state: 'opened', project_id: project1.id }
-      issues = IssuesFinder.new.execute(user, params)
-      issues.size.should == 1
-    end
-
-    it 'should be empty for unauthorized user' do
-      params = { scope: "all", state: 'opened' }
-      issues = IssuesFinder.new.execute(nil, params)
-      issues.size.should be_zero
-    end
-
-    it 'should not include unauthorized issues' do
-      params = { scope: "all", state: 'opened' }
-      issues = IssuesFinder.new.execute(user2, params)
-      issues.size.should == 2
-      issues.should_not include(issue1)
-      issues.should include(issue2)
-      issues.should include(issue3)
+      it 'should filter by project' do
+        params = { scope: "assigned-to-me", state: 'opened', project_id: project1.id }
+        issues = IssuesFinder.new.execute(user, params)
+        issues.size.should == 1
+      end
     end
   end
 end