diff --git a/ietf/meeting/tests_js.py b/ietf/meeting/tests_js.py index 818f10fd4..607f28123 100644 --- a/ietf/meeting/tests_js.py +++ b/ietf/meeting/tests_js.py @@ -1621,30 +1621,27 @@ class EditTimeslotsTests(IetfSeleniumTestCase): self.do_delete_timeslot_test(cancel=True) def do_delete_time_interval_test(self, cancel=False): - delete_day = self.meeting.date - delete_time = datetime.time(hour=10) - other_day = self.meeting.get_meeting_date(1) - other_time = datetime.time(hour=12) + delete_time_local = datetime_from_date(self.meeting.date, self.meeting.tz()).replace(hour=10) + delete_time = delete_time_local.astimezone(datetime.timezone.utc) duration = datetime.timedelta(minutes=60) delete: [TimeSlot] = TimeSlotFactory.create_batch( 2, meeting=self.meeting, - time=datetime_from_date(delete_day, self.meeting.tz()).replace(hour=delete_time.hour), + time=delete_time_local, duration=duration, ) - keep: [TimeSlot] = [ TimeSlotFactory( meeting=self.meeting, - time=datetime_from_date(day, self.meeting.tz()).replace(hour=time.hour), + time=keep_time, duration=duration ) - for (day, time) in ( - # combinations of day/time that should not be deleted - (delete_day, other_time), - (other_day, delete_time), - (other_day, other_time), + for keep_time in ( + # same day, but 2 hours later + delete_time + datetime.timedelta(hours=2), + # next day, but same wall clock time + datetime_from_date(self.meeting.get_meeting_date(1), self.meeting.tz()).replace(hour=10), ) ] @@ -1652,13 +1649,9 @@ class EditTimeslotsTests(IetfSeleniumTestCase): '#timeslot-table ' '.delete-button[data-delete-scope="column"]' '[data-col-id="{}T{}-{}"]'.format( - delete_day.isoformat(), - delete_time.strftime('%H:%M'), - self.meeting.tz().localize( - datetime.datetime.combine(delete_day, delete_time) + duration - ).strftime( - '%H:%M' - )) + delete_time_local.date().isoformat(), + delete_time_local.strftime('%H:%M'), + (delete_time + duration).astimezone(self.meeting.tz()).strftime('%H:%M')) ) self.do_delete_test(selector, keep, delete, cancel) diff --git a/ietf/templates/meeting/timeslot_edit_timeslot.html b/ietf/templates/meeting/timeslot_edit_timeslot.html index 88e1e5a19..15c6fe9d9 100644 --- a/ietf/templates/meeting/timeslot_edit_timeslot.html +++ b/ietf/templates/meeting/timeslot_edit_timeslot.html @@ -1,8 +1,8 @@