Merge "Speed up integration tests"
This commit is contained in:
commit
5d48d0c548
@ -298,8 +298,7 @@ class ThemableSelectFormFieldRegion(BaseFormFieldRegion):
|
|||||||
class BaseFormRegion(baseregion.BaseRegion):
|
class BaseFormRegion(baseregion.BaseRegion):
|
||||||
"""Base class for forms."""
|
"""Base class for forms."""
|
||||||
|
|
||||||
_submit_locator = (by.By.CSS_SELECTOR, '*.btn.btn-primary')
|
_submit_locator = (by.By.CSS_SELECTOR, '*.btn.btn-primary,*.btn.btn-danger')
|
||||||
_submit_danger_locator = (by.By.CSS_SELECTOR, '*.btn.btn-danger')
|
|
||||||
_cancel_locator = (by.By.CSS_SELECTOR, '*.btn.cancel')
|
_cancel_locator = (by.By.CSS_SELECTOR, '*.btn.cancel')
|
||||||
_default_form_locator = (by.By.CSS_SELECTOR, 'div.modal-dialog')
|
_default_form_locator = (by.By.CSS_SELECTOR, 'div.modal-dialog')
|
||||||
|
|
||||||
@ -315,10 +314,7 @@ class BaseFormRegion(baseregion.BaseRegion):
|
|||||||
|
|
||||||
@property
|
@property
|
||||||
def _submit_element(self):
|
def _submit_element(self):
|
||||||
try:
|
submit_element = self._get_element(*self._submit_locator)
|
||||||
submit_element = self._get_element(*self._submit_locator)
|
|
||||||
except exceptions.NoSuchElementException:
|
|
||||||
submit_element = self._get_element(*self._submit_danger_locator)
|
|
||||||
return submit_element
|
return submit_element
|
||||||
|
|
||||||
def submit(self):
|
def submit(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user