spec: make date(time) checks less brittle

format date(time)s the same way we do in the code; fixes several failing
specs on master caused by date strings conditionally including the year.

Change-Id: I4ab8f767be2fac08543c3dda8bc37740e82cf16a
Reviewed-on: https://gerrit.instructure.com/69450
Reviewed-by: Simon Williams <simon@instructure.com>
Tested-by: Jenkins
Product-Review: Jon Jensen <jon@instructure.com>
QA-Review: Jon Jensen <jon@instructure.com>

Author: jenseng

spec/selenium/helpers/assignment_overrides.rb

@@ -1,4 +1,5 @@
 module AssignmentOverridesSeleniumHelper
+  include TextHelper
 
   def visit_new_assignment_page
     get "/courses/#{@course.id}/assignments/new"
@@ -112,12 +113,9 @@ def assign_dates_for_last_override_section(opts = {})
   end
 
   def find_vdd_time(override_context)
-    @due_at_time = override_context.due_at.strftime('%b %-d at %-l:%M') <<
-                                                               override_context.lock_at.strftime('%p').downcase
-    @lock_at_time = override_context.lock_at.strftime('%b %-d at %-l:%M') <<
-                                                               override_context.lock_at.strftime('%p').downcase
-    @unlock_at_time = override_context.unlock_at.strftime('%b %-d at %-l:%M') <<
-                                                               override_context.unlock_at.strftime('%p').downcase
+    @due_at_time = format_time_for_view(override_context.due_at)
+    @lock_at_time = format_time_for_view(override_context.lock_at)
+    @unlock_at_time = format_time_for_view(override_context.unlock_at)
   end
 
   def add_due_date_override(assignment, due_at = Time.zone.now.advance(days:1))
@@ -274,21 +272,13 @@ def set_quiz_dates_for_section_b
   end
 
   # Formatted output: Mmm d, e.g. 'Jan 1'
-  def format_date_for_view(date)
-    date.strftime('%b %-d')
+  def format_date_for_view(date, format = :short)
+    I18n.l(date.to_date, format: format)
   end
 
   # Formatted output: Mmm d at h:mm, e.g. 'Jan 1 at 1:01pm'
-  # Note: Removes on-the-hour minutes, e.g. '5:00pm' becomes '5pm'
   def format_time_for_view(time)
-    formatter = '%b %-d at %-l'
-    formatted_time = time.strftime(formatter)
-
-    on_the_hour = true if time.strftime(':%M') == ':00'
-    formatted_time << time.strftime(':%M') unless on_the_hour
-
-    # append 'am' or 'pm'
-    formatted_time << time.strftime('%p').downcase
+    datetime_string(time, :no_words).gsub(/ +/, ' ')
   end
 
   def obtain_due_date(section)
@@ -344,4 +334,4 @@ def create_assignment_override(assignment, section, due_date)
     override.due_at = due_date.days.from_now
     override.save!
   end
-end
+end

spec/selenium/quizzes/varied_due_dates/quizzes_vdd_index_page_student_spec.rb

@@ -21,7 +21,7 @@
 
     it 'shows the availability dates for Section A', priority: "1", test_id: 282389 do
       expect(f('.date-available')).to include_text("Available until "\
-        "#{format_date_for_view(@lock_at_a)}")
+        "#{date_string(@lock_at_a, :no_words)}")
     end
   end
 
@@ -39,7 +39,7 @@
 
     it 'shows the availability dates for Section B', priority: "1", test_id: 282391 do
       expect(f('.date-available')).to include_text("Not available until "\
-        "#{format_date_for_view(@unlock_at_b)}")
+        "#{date_string(@unlock_at_b, :no_words)}")
     end
   end
 end