arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-25 17:32:16 +00:00
Code Issues Projects Releases Wiki Activity

Fix iCal tests

Browse Source
This commit is contained in:
David Taylor
2017-06-21 12:04:30 +01:00
committed by Tom Price
parent ee930aa86a
commit 0aec836b1a
1 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
RIGS/test_functional.py
View File

@@ -941,16 +941,18 @@ class IcalTest(LiveServerTestCase):
response = c.get(icalUrl) response = c.get(icalUrl)
self.assertEqual(200, response.status_code) self.assertEqual(200, response.status_code)
# content = response.content.decode('utf-8')
# Check has entire file # Check has entire file
self.assertIn("BEGIN:VCALENDAR", response.content) self.assertContains(response, "BEGIN:VCALENDAR")
self.assertIn("END:VCALENDAR", response.content) self.assertContains(response, "END:VCALENDAR")
expectedIn = [1, 2, 3, 5, 6, 7, 10, 11, 12, 13, 15, 16, 17] expectedIn = [1, 2, 3, 5, 6, 7, 10, 11, 12, 13, 15, 16, 17]
for test in range(1, 18): for test in range(1, 18):
if test in expectedIn: if test in expectedIn:
self.assertIn("TE E" + str(test) + " ", response.content) self.assertContains(response, "TE E" + str(test) + " ")
else: else:
self.assertNotIn("TE E" + str(test) + " ", response.content) self.assertNotContains(response, "TE E" + str(test) + " ")
# Only dry hires # Only dry hires
self.browser.find_element_by_xpath("//input[@value='rig']").click() self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -963,9 +965,9 @@ class IcalTest(LiveServerTestCase):
expectedIn = [10, 11, 12, 13] expectedIn = [10, 11, 12, 13]
for test in range(1, 18): for test in range(1, 18):
if test in expectedIn: if test in expectedIn:
self.assertIn("TE E" + str(test) + " ", response.content) self.assertContains(response, "TE E" + str(test) + " ")
else: else:
self.assertNotIn("TE E" + str(test) + " ", response.content) self.assertNotContains(response, "TE E" + str(test) + " ")
# Only provisional rigs # Only provisional rigs
self.browser.find_element_by_xpath("//input[@value='rig']").click() self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -979,9 +981,9 @@ class IcalTest(LiveServerTestCase):
expectedIn = [1, 2] expectedIn = [1, 2]
for test in range(1, 18): for test in range(1, 18):
if test in expectedIn: if test in expectedIn:
self.assertIn("TE E" + str(test) + " ", response.content) self.assertContains(response, "TE E" + str(test) + " ")
else: else:
self.assertNotIn("TE E" + str(test) + " ", response.content) self.assertNotContains(response, "TE E" + str(test) + " ")
# Only cancelled non-rigs # Only cancelled non-rigs
self.browser.find_element_by_xpath("//input[@value='rig']").click() self.browser.find_element_by_xpath("//input[@value='rig']").click()
@@ -996,9 +998,9 @@ class IcalTest(LiveServerTestCase):
expectedIn = [18] expectedIn = [18]
for test in range(1, 18): for test in range(1, 18):
if test in expectedIn: if test in expectedIn:
self.assertIn("TE E" + str(test) + " ", response.content) self.assertContains(response, "TE E" + str(test) + " ")
else: else:
self.assertNotIn("TE E" + str(test) + " ", response.content) self.assertNotContains(response, "TE E" + str(test) + " ")
# Nothing selected # Nothing selected
self.browser.find_element_by_xpath("//input[@value='non-rig']").click() self.browser.find_element_by_xpath("//input[@value='non-rig']").click()
@@ -1011,9 +1013,9 @@ class IcalTest(LiveServerTestCase):
expectedIn = [] expectedIn = []
for test in range(1, 18): for test in range(1, 18):
if test in expectedIn: if test in expectedIn:
self.assertIn("TE E" + str(test) + " ", response.content) self.assertContains(response, "TE E" + str(test) + " ")
else: else:
self.assertNotIn("TE E" + str(test) + " ", response.content) self.assertNotContains(response, "TE E" + str(test) + " ")
# Wow - that was a lot of tests # Wow - that was a lot of tests