Skip to content

test: refactor tests to avoid shadowing meeting.date with a datetime #4430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennifer-richards merged 1 commit into from
Sep 12, 2022
Merged

test: refactor tests to avoid shadowing meeting.date with a datetime #4430

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 15 additions & 22 deletions ietf/meeting/tests_js.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
from ietf.utils.test_utils import assert_ical_response_is_valid
from ietf.utils.jstest import ( IetfSeleniumTestCase, ifSeleniumEnabled, selenium_enabled,
presence_of_element_child_by_css_selector )
from ietf.utils.timezone import datetime_today
from ietf.utils.timezone import datetime_today, datetime_from_date, date_today

if selenium_enabled():
from selenium.webdriver.common.action_chains import ActionChains
Expand Down Expand Up @@ -2613,7 +2613,7 @@ def setUp(self):
self.meeting: Meeting = MeetingFactory(
type_id='ietf',
number=120,
date=timezone.now() + datetime.timedelta(days=10),
date=date_today() + datetime.timedelta(days=10),
populate_schedule=False,
)
self.edit_timeslot_url = self.absreverse(
Expand Down Expand Up @@ -2683,26 +2683,23 @@ def test_delete_timeslot_cancel(self):
self.do_delete_timeslot_test(cancel=True)

def do_delete_time_interval_test(self, cancel=False):
delete_day = self.meeting.date.date()
delete_day = self.meeting.date
delete_time = datetime.time(hour=10)
other_day = self.meeting.get_meeting_date(1).date()
other_day = self.meeting.get_meeting_date(1)
other_time = datetime.time(hour=12)
duration = datetime.timedelta(minutes=60)

delete: [TimeSlot] = TimeSlotFactory.create_batch(
2,
meeting=self.meeting,
time=self.meeting.tz().localize(
datetime.datetime.combine(delete_day, delete_time)
),
duration=duration)
time=datetime_from_date(delete_day, self.meeting.tz()).replace(hour=delete_time.hour),
duration=duration,
)

keep: [TimeSlot] = [
TimeSlotFactory(
meeting=self.meeting,
time=self.meeting.tz().localize(
datetime.datetime.combine(day, time)
),
time=datetime_from_date(day, self.meeting.tz()).replace(hour=time.hour),
duration=duration
)
for (day, time) in (
Expand Down Expand Up @@ -2736,26 +2733,22 @@ def test_delete_time_interval_cancel(self):
self.do_delete_time_interval_test(cancel=True)

def do_delete_day_test(self, cancel=False):
delete_day = self.meeting.date.date()
times = [datetime.time(hour=10), datetime.time(hour=12)]
other_days = [self.meeting.get_meeting_date(d).date() for d in range(1, 3)]
delete_day = self.meeting.date
hours = [10, 12]
other_days = [self.meeting.get_meeting_date(d) for d in range(1, 3)]

delete: [TimeSlot] = [
TimeSlotFactory(
meeting=self.meeting,
time=self.meeting.tz().localize(
datetime.datetime.combine(delete_day, time)
),
) for time in times
time=datetime_from_date(delete_day, self.meeting.tz()).replace(hour=hour),
) for hour in hours
]

keep: [TimeSlot] = [
TimeSlotFactory(
meeting=self.meeting,
time=self.meeting.tz().localize(
datetime.datetime.combine(day, time)
),
) for day in other_days for time in times
time=datetime_from_date(day, self.meeting.tz()).replace(hour=hour),
) for day in other_days for hour in hours
]

selector = (
Expand Down