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

Fix some issues caused by changes made over the last year

Browse Source
This commit is contained in:
David Taylor
2017-05-10 17:51:55 +01:00
parent 7ac9eef7a2
commit e573088c5e
5 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
RIGS/test_functional.py
View File

@@ -499,12 +499,8 @@ class EventTest(LiveServerTestCase):
# Attempt to save
save.click()
<<<<<<< HEAD
self.assertNotIn("N%05d"%testEvent.pk, self.browser.find_element_by_xpath('//h1').text)
=======
self.assertNotIn("N0000%d"%testEvent.pk, self.browser.find_element_by_xpath('//h1').text)
self.assertNotIn("Event data duplicated but not yet saved", self.browser.find_element_by_id('content').text) # Check info message not visible
>>>>>>> 9b7c84cf0890788a08a3dec71e00cbe78748b1fb
# Check the new items are visible
table = self.browser.find_element_by_id('item-table') # ID number is known, see above
@@ -513,13 +509,12 @@ class EventTest(LiveServerTestCase):
self.assertIn("Test Item 3", table.text)
infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
<<<<<<< HEAD
self.assertIn("N%05d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
=======
self.assertIn("N0000%d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
# Check the PO hasn't carried through
self.assertNotIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
>>>>>>> 9b7c84cf0890788a08a3dec71e00cbe78748b1fb
@@ -527,13 +522,12 @@ class EventTest(LiveServerTestCase):
#Check that based-on hasn't crept into the old event
infoPanel = self.browser.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
<<<<<<< HEAD
self.assertNotIn("N%05d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
=======
self.assertNotIn("N0000%d"%testEvent.pk, infoPanel.find_element_by_xpath('//dt[text()="Based On"]/following-sibling::dd[1]').text)
# Check the PO remains on the old event
self.assertIn("TESTPO", infoPanel.find_element_by_xpath('//dt[text()="PO"]/following-sibling::dd[1]').text)
>>>>>>> 9b7c84cf0890788a08a3dec71e00cbe78748b1fb
# Check the items are as they were
table = self.browser.find_element_by_id('item-table') # ID number is known, see above