Fix specs and improve milestones finder specissue_30126_be

2 files changed, 51 insertions, 9 deletions

diff --git a/app/controllers/projects/milestones_controller.rb b/app/controllers/projects/milestones_controller.rb
index a5be1cc1871..56c96c181fe 100644
--- a/app/controllers/projects/milestones_controller.rb
+++ b/app/controllers/projects/milestones_controller.rb
@@ -89,7 +89,7 @@ class Projects::MilestonesController < Projects::ApplicationController
         group = @project.group
       end
 
-      search_params = params.merge(project_ids: @project.id, group_ids: group.id)
+      search_params = params.merge(project_ids: @project.id, group_ids: group&.id)
 
       MilestonesFinder.new(search_params).execute
     end
diff --git a/spec/finders/milestones_finder_spec.rb b/spec/finders/milestones_finder_spec.rb
index e81a5bae9a9..32ec983c5b8 100644
--- a/spec/finders/milestones_finder_spec.rb
+++ b/spec/finders/milestones_finder_spec.rb
@@ -4,45 +4,87 @@ describe MilestonesFinder do
   let(:group) { create(:group) }
   let(:project_1) { create(:empty_project, namespace: group) }
   let(:project_2) { create(:empty_project, namespace: group) }
-  let!(:milestone_1) { create(:milestone, group: group) }
+  let!(:milestone_1) { create(:milestone, group: group, title: 'one test', due_date: Date.today) }
   let!(:milestone_2) { create(:milestone, group: group) }
-  let!(:milestone_3) { create(:milestone, project: project_1, state: 'active') }
+  let!(:milestone_3) { create(:milestone, project: project_1, state: 'active', due_date: Date.tomorrow) }
   let!(:milestone_4) { create(:milestone, project: project_2, state: 'active') }
 
   it 'it returns milestones for projects' do
-    result = described_class.new(projects: [project_1, project_2], params: { state: 'all' }).execute
+    result = described_class.new(project_ids: [project_1.id, project_2.id], state: 'all').execute
 
     expect(result).to contain_exactly(milestone_3, milestone_4)
   end
 
   it 'returns milestones for groups' do
-    result = described_class.new(groups: group, params: { state: 'all' }).execute
+    result = described_class.new(group_ids: group.id,  state: 'all').execute
 
     expect(result).to contain_exactly(milestone_1, milestone_2)
   end
 
   it 'returns milestones for groups and projects' do
-    result = described_class.new(projects: [project_1, project_2], groups: group, params: { state: 'all' }).execute
+    result = described_class.new(project_ids: [project_1.id, project_2.id], group_ids: group.id, state: 'all').execute
 
     expect(result).to contain_exactly(milestone_1, milestone_2, milestone_3, milestone_4)
   end
 
-  context 'state filtering' do
+  context 'with filters' do
+    let(:params) do
+      {
+        project_ids: [project_1.id, project_2.id],
+        group_ids: group.id,
+        state: 'all'
+      }
+    end
+
     before do
       milestone_1.close
       milestone_3.close
     end
 
     it 'filters by active state' do
-      result = described_class.new(projects: [project_1, project_2], groups: group, params: { state: 'active' }).execute
+      params[:state] = 'active'
+      result = described_class.new(params).execute
 
       expect(result).to contain_exactly(milestone_2, milestone_4)
     end
 
     it 'filters by closed state' do
-      result = described_class.new(projects: [project_1, project_2], groups: group, params: { state: 'closed' }).execute
+      params[:state] = 'closed'
+      result = described_class.new(params).execute
 
       expect(result).to contain_exactly(milestone_1, milestone_3)
     end
+
+    it 'filters by title' do
+      result = described_class.new(params.merge(title: 'one test')).execute
+
+      expect(result.to_a).to contain_exactly(milestone_1)
+    end
+  end
+
+  context 'with order' do
+    let(:params) do
+      {
+        project_ids: [project_1.id, project_2.id],
+        group_ids: group.id,
+        state: 'all'
+      }
+    end
+
+    it "default orders by due date" do
+      result = described_class.new(params).execute
+
+      expect(result.first).to eq(milestone_1)
+      expect(result.second).to eq(milestone_3)
+    end
+
+    it "orders by parameter" do
+      result = described_class.new(params.merge(order: 'id DESC')).execute
+
+      expect(result.first).to eq(milestone_4)
+      expect(result.second).to eq(milestone_3)
+      expect(result.third).to eq(milestone_2)
+      expect(result.fourth).to eq(milestone_1)
+    end
   end
 end