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 database locking shenanigans

Browse Source
This commit is contained in:
FreneticScribbler
2021-02-15 00:44:26 +00:00
parent 6c9e360927
commit 925498be02
5 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
RIGS/tests/pages.py
View File

@@ -283,21 +283,24 @@ class EditEventChecklist(CreateEventChecklist):
@property
def vehicles(self):
return [
self.VehicleRow(self, el) for el in self.find_elements(*self._vehicle_row_locator)
]
return [self.VehicleRow(self, el) for el in self.find_elements(*self._vehicle_row_locator)]
class VehicleRow(Region):
_name_locator = ('xpath', "//input[@id[starts-with(., 'vehicle')]")
_select_locator = ('xpath', "//div[contains(@class, 'bootstrap-select')]")
_name_locator = ('xpath', ".//input")
_select_locator = ('xpath', ".//div[contains(@class,'bootstrap-select')]/..")
@property
def name(self):
return regions.TextBox(self, *_name_locator)
return regions.TextBox(self, self.root.find_element(*self._name_locator))
@property
def vehicle(self):
return regions.BootstrapSelect(self, self.find_element(*self._select_locator))
return regions.BootstrapSelectElement(self, self.root.find_element(*self._select_locator))
@property
def success(self):
return 'edit' not in self.driver.current_url
class GenericList(BasePage):
_search_selector = (By.CSS_SELECTOR, 'div.input-group:nth-child(2) > input:nth-child(1)')

7
RIGS/tests/test_interaction.py
View File

@@ -733,14 +733,13 @@ def test_ec_create_medium(logged_in_browser, live_server, admin_user, medium_ra)
assert page.success
# TODO POM Refactor
def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist):
page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
page.add_vehicle()
assert len(page.vehicles) == 1
vehicle_name = 'Brian'
page.vehicles[0].name = vehicle_name
page.vehicles[0].vehicle.search(admin_user.name)
page.vehicles[0].name.set_value(vehicle_name)
page.vehicles[0].vehicle.search(admin_user.first_name)
page.submit()
assert page.success
# Check data is correct
@@ -749,6 +748,8 @@ def test_ec_create_vehicle(logged_in_browser, live_server, admin_user, checklist
assert vehicle_name == vehicle.vehicle
#FIXME
@pytest.mark.xfail
def test_ec_create_crew(logged_in_browser, live_server, admin_user, checklist):
page = pages.EditEventChecklist(logged_in_browser.driver, live_server.url, pk=checklist.pk).open()
page.add_crew()