Merge 5ca7f8e into 576d808

expertiza · Mar 18, 2023 · e99a2bd · e99a2bd
2 parents 576d808 + 5ca7f8e
commit e99a2bd
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 1 deletion.
diff --git a/app/models/due_date.rb b/app/models/due_date.rb
@@ -29,7 +29,7 @@ def <=>(other)
   def self.deadline_sort(due_dates)
     due_dates.sort
   end
-  
+
   def self.assignment_latest_review_round(assignment_id, response)
     # for author feedback, quiz, teammate reviews, rounds # should be 1
     maps = ResponseMap.where(id: response.map_id, type: 'ReviewResponseMap')

diff --git a/spec/models/due_date_spec.rb b/spec/models/due_date_spec.rb
@@ -111,4 +111,38 @@
   it 'review submission_allowed default permission NO' do
     expect(DueDate.new.default_permission('review', 'submission_allowed')).to be == DeadlineRight::NO
   end
+
+  describe '#get_following_assignment_due_dates' do
+    it 'no following due dates' do
+      expect(Assignment.new.get_following_assignment_due_dates(@assignment_due_date.parent_id).empty?).to be true
+    end
+
+    it 'get following assignment due dates' do
+      due_date = create(:assignment_due_date, deadline_type: @deadline_type,
+                                              submission_allowed_id: @deadline_right.id, review_allowed_id: @deadline_right.id,
+                                              review_of_review_allowed_id: @deadline_right.id, due_at: Time.zone.now + 5000)
+      expect(Assignment.new.get_following_assignment_due_dates(due_date.parent_id).first).to be_valid
+    end
+
+    it 'following due dates does not exist for staggered deadline' do
+      assignment_id = create(:assignment, staggered_deadline: true, name: 'TestAssignment2', directory_path: 'TestAssignment2').id
+      expect(Assignment.new.get_following_assignment_due_dates(assignment_id).empty?).to be true
+    end
+
+    it 'following due dates is before Time.now for staggered deadline' do
+      assignment_id = create(:assignment, staggered_deadline: true, name: 'TestAssignment3', directory_path: 'TestAssignment3').id
+      due_date = create(:topic_due_date, deadline_type: @deadline_type,
+                                         submission_allowed_id: @deadline_right, review_allowed_id: @deadline_right,
+                                         review_of_review_allowed_id: @deadline_right, due_at: Time.zone.now - 5000, parent_id: assignment_id)
+      expect(Assignment.new.get_following_assignment_due_dates(assignment_id, due_date.parent_id)).to be nil
+    end
+
+    it 'get following due dates from assignment for staggered deadline' do
+      assignment_id = create(:assignment, staggered_deadline: true, name: 'TestAssignment4', directory_path: 'TestAssignment4').id
+      due_date = create(:assignment_due_date, deadline_type: @deadline_type,
+                                              submission_allowed_id: @deadline_right, review_allowed_id: @deadline_right,
+                                              review_of_review_allowed_id: @deadline_right, due_at: Time.zone.now + 5000, parent_id: assignment_id)
+      expect(Assignment.new.get_following_assignment_due_dates(assignment_id).first).to be_valid
+    end
+  end
 end