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

Revert to old submit wait behaviour

Browse Source
This commit is contained in:
FreneticScribbler
2020-05-26 15:02:44 +01:00
parent 3f78b9f05f
commit e45e58321c
2 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PyRIGS/tests/pages.py
View File

@@ -39,10 +39,11 @@ class FormPage(BasePage):
"Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});") "Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
def submit(self): def submit(self):
previous_errors = self.errors
submit = self.find_element(*self._submit_locator) submit = self.find_element(*self._submit_locator)
ActionChains(self.driver).move_to_element(submit).perform() ActionChains(self.driver).move_to_element(submit).perform()
submit.click() submit.click()
# self.wait.until(lambda x: self.errors != previous_errors or self.success) This breaks my date validation test... :D self.wait.until(lambda x: self.errors != previous_errors or self.success)
@property @property
def errors(self): def errors(self):

20
RIGS/tests/test_functional.py
View File

@@ -127,7 +127,6 @@ class TestEventCreate(BaseRigboardTest):
# TODO Test validation with some wrong data # TODO Test validation with some wrong data
self.page.submit() self.page.submit()
self.driver.implicitly_wait(10)
self.assertTrue(self.page.success) self.assertTrue(self.page.success)
# TODO # TODO
@@ -170,6 +169,7 @@ class TestEventCreate(BaseRigboardTest):
# TODO # TODO
# TODO Convert the below three tests into non-live tests and use only one wrong data in the above test to check error display
def test_date_validation(self): def test_date_validation(self):
self.select_event_type("Rig") self.select_event_type("Rig")
@@ -188,6 +188,23 @@ class TestEventCreate(BaseRigboardTest):
self.assertIn("can't finish before it has started", self.page.errors["General form errors"][0]) self.assertIn("can't finish before it has started", self.page.errors["General form errors"][0])
self.wait.until(animation_is_finished()) self.wait.until(animation_is_finished())
# Fix it
self.page.end_date = datetime.date(2020, 1, 11)
# Should work
self.page.submit()
self.assertTrue(self.page.success)
# TODO Seperated because of the way submit checks erroring
def test_date_validation_2(self):
self.select_event_type("Rig")
self.page.person_selector.search(self.client.name)
self.page.person_selector.set_option(self.client.name, True)
self.page.person_selector.toggle()
self.assertFalse(self.page.person_selector.is_open)
self.page.name = "Test Date Validation"
# end time before start # end time before start
self.page.start_date = datetime.date(2020, 1, 1) self.page.start_date = datetime.date(2020, 1, 1)
self.page.start_time = datetime.time(10) self.page.start_time = datetime.time(10)
@@ -210,7 +227,6 @@ class TestEventCreate(BaseRigboardTest):
self.page.person_selector.search(self.client.name) self.page.person_selector.search(self.client.name)
self.page.person_selector.set_option(self.client.name, True) self.page.person_selector.set_option(self.client.name, True)
# TODO This should not be necessary, normally closes automatically
self.page.person_selector.toggle() self.page.person_selector.toggle()
self.assertFalse(self.page.person_selector.is_open) self.assertFalse(self.page.person_selector.is_open)