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 the remaining tests

Browse Source
This commit is contained in:
FreneticScribbler
2020-05-25 22:47:34 +01:00
parent 177c37ffbc
commit fd6aee83cf
9 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
RIGS/tests/pages.py
View File

@@ -59,6 +59,7 @@ class EventDetail(BasePage):
_name_selector = (By.XPATH, '//dt[text()="Person"]/following-sibling::dd[1]')
_email_selector = (By.XPATH, '//dt[text()="Email"]/following-sibling::dd[1]')
_phone_selector = (By.XPATH, '//dt[text()="Phone Number"]/following-sibling::dd[1]')
_event_table_selector = (By.ID, 'item-table')
@property
def event_name(self):
@@ -76,6 +77,10 @@ class EventDetail(BasePage):
def phone(self):
return self.find_element(*self._person_panel_selector).find_element(*self._phone_selector).text
@property
def item_table(self):
return self.find_element(*self._event_table_selector)
class CreateEvent(FormPage):
URL_TEMPLATE = reverse('event_create')

17
RIGS/tests/test_functional.py
View File

@@ -166,7 +166,9 @@ class TestEventCreate(BaseRigboardTest):
modal.submit()
self.wait.until(EC.invisibility_of_element_located((By.ID, 'modal')))
self.assertFalse(modal.is_open)
self.assertEqual(self.page.person_selector.options[1].name, person_name)
self.page.person_selector.toggle()
self.assertEqual(self.page.person_selector.options[0].name, person_name)
self.page.person_selector.toggle()
# TODO
@@ -392,7 +394,7 @@ class TestEventDuplicate(BaseRigboardTest):
self.assertIn("Test Item 3", table.text)
infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
self.assertIn("N0000%d" % self.testEvent.pk,
self.assertIn("N%05d" % self.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)
@@ -404,7 +406,7 @@ class TestEventDuplicate(BaseRigboardTest):
# Check that based-on hasn't crept into the old event
infoPanel = self.driver.find_element_by_xpath('//div[contains(text(), "Event Info")]/..')
self.assertNotIn("N0000%d" % self.testEvent.pk,
self.assertNotIn("N%05d" % self.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)
@@ -471,7 +473,8 @@ class TestEventEdit(BaseRigboardTest):
self.assertTrue(self.page.success)
self.page = pages.EventDetail(self.driver, self.live_server_url, event_id=self.testEvent.pk).open()
self.assertIn(self.page.event_name, self.testEvent.name)
self.testEvent.refresh_from_db()
self.assertIn(self.testEvent.name, self.page.event_name)
self.assertEqual(self.page.name, self.testEvent.person.name)
# Check the new items are visible
table = self.page.item_table
@@ -509,9 +512,9 @@ class TestEventDetail(BaseRigboardTest):
def test_rig_detail(self):
self.assertIn("N%05d | %s" % (self.testEvent.pk, self.testEvent.name), self.page.event_name)
self.assertEqual(person.name, self.page.name)
self.assertEqual(person.email, self.page.email)
self.assertEqual(person.phone, self.page.phone)
self.assertEqual(self.client.name, self.page.name)
self.assertEqual(self.client.email, self.page.email)
self.assertEqual(self.client.phone, None)
class TestCalendar(BaseRigboardTest):

3
RIGS/tests/test_models.py
View File

@@ -3,7 +3,8 @@ from reversion import revisions as reversion
from django.conf import settings
from django.core.exceptions import ValidationError
from django.test import TestCase
from RIGS import models, versioning
from RIGS import models
from versioning import versioning
from datetime import date, timedelta, datetime, time
from decimal import *
from PyRIGS.tests.base import create_browser