Moved definition of safe_add/subtract_days so they can be used in other tests, used them to fix test failing intermitently on the 14th

Author: Benjamin-Couey

app/models/organization.rb

@@ -269,7 +269,7 @@ def reminder_schedule_is_empty_or_valid?
       end
       if reminder_schedule.by_month_or_week == "day_of_month" && reminder_schedule.day_of_month.to_i == deadline_day.to_i
         errors.add(:day_of_month, "Reminder day must not be the same as deadline day")
-      end 
+      end
     end
   end
 

app/models/partner_group.rb

@@ -54,7 +54,7 @@ def reminder_schedule_is_empty_or_valid?
       end
       if deadline_on_reminder_date?
         errors.add(:day_of_month, "Reminder day must not be the same as deadline day")
-      end 
+      end
     end
   end
 
@@ -64,7 +64,7 @@ def reminder_schedule_present?
     end
     if deadline_on_reminder_date?
       errors.add(:day_of_month, "Reminder day must not be the same as deadline day")
-    end 
+    end
   end
 
   def deadline_on_reminder_date?

spec/support/deadline_day_fields_shared_example.rb

@@ -1,3 +1,27 @@
+# The reminder day (the #{form_prefix}_reminder_schedule_service_day_of_month field ) has to be less than or equal to 28.
+# These functions are implemented to calculate dates prior or after a given date that do not fall on a
+# date with a day greater than 28.
+# It is recommended to use these functions to calculate, from now, inputs for the reminder day and deadline day fields if
+# your test cares about the text created by the deadline_day_controller.js controller as there isn't an easy way to spoof
+# the current time in the test browser and different behavior could occur if the test is run on different days.
+def safe_add_days(date, num)
+  result = date + num.days
+  if result.day > 28
+    result = result.change({day: 1 + num})
+    result += 1.month
+  end
+  result
+end
+
+def safe_subtract_days(date, num)
+  result = date - num.days
+  if result.day > 28
+    result = result.change({day: 28 - num})
+    result -= 1.month
+  end
+  result
+end
+
 RSpec.shared_examples_for "deadline and reminder form" do |form_prefix, save_button, post_form_submit|
   it "can set a reminder on a day of the month" do
     choose "Day of Month"
@@ -34,7 +58,6 @@
     expect(page).to_not have_content("Your next reminder date is")
     expect(page).to_not have_content("The deadline on your next reminder email will be")
 
-
     fill_in "#{form_prefix}_reminder_schedule_service_day_of_month", with: "-1"
     expect(page).to have_content("Reminder day must be between 1 and 28")
     fill_in "#{form_prefix}_reminder_schedule_service_day_of_month", with: "20"
@@ -52,27 +75,6 @@
   end
 
   describe "reported reminder and deadline dates" do
-    # The reminder day (the #{form_prefix}_reminder_schedule_service_day_of_month field ) has to be less than or equal to 28.
-    # These functions are implemented to calculate dates prior or after @now that do not fall on a
-    # date with a day greater than 28.
-    def safe_add_days(date, num)
-      result = date + num.days
-      if result.day > 28
-        result = result.change({day: 1 + num})
-        result += 1.month
-      end
-      result
-    end
-
-    def safe_subtract_days(date, num)
-      result = date - num.days
-      if result.day > 28
-        result = result.change({day: 28 - num})
-        result -= 1.month
-      end
-      result
-    end
-
     context "when the reminder is a day of the month" do
       before do
         choose "Day of Month"

spec/system/organization_system_spec.rb

@@ -75,8 +75,8 @@ def post_form_submit
 
       it "the deadline day form's reminder and deadline dates are consistent with the dates calculated by the FetchPartnersToRemindNowService and DeadlineService" do
         choose "Day of Month"
-        fill_in "organization_reminder_schedule_service_day_of_month", with: 14
-        fill_in "Deadline day in reminder email", with: 21
+        fill_in "organization_reminder_schedule_service_day_of_month", with: safe_add_days(Time.zone.now, 1).day
+        fill_in "Deadline day in reminder email", with: safe_add_days(Time.zone.now, 2).day
 
         reminder_text = find('small[data-deadline-day-target="reminderText"]').text
         reminder_text.slice!("Your next reminder date is ")

spec/system/partner_system_spec.rb

@@ -721,8 +721,8 @@
 
           it "the deadline day form's reminder and deadline dates are consistent with the dates calculated by the FetchPartnersToRemindNowService and DeadlineService" do
             choose "Day of Month"
-            fill_in "partner_group_reminder_schedule_service_day_of_month", with: 14
-            fill_in "Deadline day in reminder email", with: 21
+            fill_in "partner_group_reminder_schedule_service_day_of_month", with: safe_add_days(Time.zone.now, 1).day
+            fill_in "Deadline day in reminder email", with: safe_add_days(Time.zone.now, 2).day
 
             reminder_text = find('small[data-deadline-day-target="reminderText"]').text
             reminder_text.slice!("Your next reminder date is ")