Some deduplication for testing code

PyRIGS/tests/pages.py

@@ -2,7 +2,7 @@ from pypom import Page, Region
 from selenium.webdriver.common.by import By
 from selenium.webdriver import Chrome
 from selenium.common.exceptions import NoSuchElementException
-
+from PyRIGS.tests import regions
 
 class BasePage(Page):
     form_items = {}
@@ -34,37 +34,19 @@ class FormPage(BasePage):
         self.driver.execute_script("Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
         self.driver.execute_script("Array.from(document.getElementsByTagName(\"select\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")
 
+    def submit(self):
+        previous_errors = self.errors
+        self.find_element(*self._submit_locator).click()
+        self.wait.until(lambda x: self.errors != previous_errors or self.success)
+
     @property
     def errors(self):
         try:
-            error_page = self.ErrorPage(self, self.find_element(*self._errors_selector))
+            error_page = regions.ErrorPage(self, self.find_element(*self._errors_selector))
             return error_page.errors
         except NoSuchElementException:
             return None
 
-    class ErrorPage(Region):
-        _error_item_selector = (By.CSS_SELECTOR, "dl>span")
-
-        class ErrorItem(Region):
-            _field_selector = (By.CSS_SELECTOR, "dt")
-            _error_selector = (By.CSS_SELECTOR, "dd>ul>li")
-
-            @property
-            def field_name(self):
-                return self.find_element(*self._field_selector).text
-
-            @property
-            def errors(self):
-                return [x.text for x in self.find_elements(*self._error_selector)]
-
-        @property
-        def errors(self):
-            error_items = [self.ErrorItem(self, x) for x in self.find_elements(*self._error_item_selector)]
-            errors = {}
-            for error in error_items:
-                errors[error.field_name] = error.errors
-            return errors
-
 
 class LoginPage(BasePage):
     URL_TEMPLATE = '/user/login'

PyRIGS/tests/regions.py

@@ -131,3 +131,27 @@ class SingleSelectPicker(Region):
     def set_value(self, value):
         picker = Select(self.root)
         picker.select_by_visible_text(value)
+
+
+class ErrorPage(Region):
+            _error_item_selector = (By.CSS_SELECTOR, "dl>span")
+
+            class ErrorItem(Region):
+                _field_selector = (By.CSS_SELECTOR, "dt")
+                _error_selector = (By.CSS_SELECTOR, "dd>ul>li")
+
+                @property
+                def field_name(self):
+                    return self.find_element(*self._field_selector).text
+
+                @property
+                def errors(self):
+                    return [x.text for x in self.find_elements(*self._error_selector)]
+
+            @property
+            def errors(self):
+                error_items = [self.ErrorItem(self, x) for x in self.find_elements(*self._error_item_selector)]
+                errors = {}
+                for error in error_items:
+                    errors[error.field_name] = error.errors
+                return errors

assets/tests/pages.py

@@ -98,11 +98,6 @@ class AssetForm(FormPage):
     def parent_selector(self):
         return regions.BootstrapSelectElement(self, self.find_element(*self._parent_select_locator))
 
-    def submit(self):
-        previous_errors = self.errors
-        self.find_element(*self._submit_locator).click()
-        self.wait.until(lambda x: self.errors != previous_errors or self.success)
-
 
 class AssetEdit(AssetForm):
     URL_TEMPLATE = '/assets/asset/id/{asset_id}/edit/'
@@ -165,11 +160,6 @@ class SupplierForm(FormPage):
         'name': (regions.TextBox, (By.ID, 'id_name')),
     }
 
-    def submit(self):
-        previous_errors = self.errors
-        self.find_element(*self._submit_locator).click()
-        self.wait.until(lambda x: self.errors != previous_errors or self.success)
-
 
 class SupplierCreate(SupplierForm):
     URL_TEMPLATE = reverse('supplier_create')
@@ -240,7 +230,7 @@ class AssetAuditList(AssetList):
         @property
         def errors(self):
             try:
-                error_page = self.ErrorPage(self, self.find_element(*self._errors_selector))
+                error_page = regions.ErrorPage(self, self.find_element(*self._errors_selector))
                 return error_page.errors
             except NoSuchElementException:
                 return None
@@ -248,30 +238,7 @@ class AssetAuditList(AssetList):
         def submit(self):
             previous_errors = self.errors
             self.root.find_element(*self._submit_locator).click()
-            # self.wait.until(lambda x: not self.is_displayed)
+            # self.wait.until(lambda x: not self.is_displayed) TODO
-
-        class ErrorPage(Region):
-            _error_item_selector = (By.CSS_SELECTOR, "dl>span")
-
-            class ErrorItem(Region):
-                _field_selector = (By.CSS_SELECTOR, "dt")
-                _error_selector = (By.CSS_SELECTOR, "dd>ul>li")
-
-                @property
-                def field_name(self):
-                    return self.find_element(*self._field_selector).text
-
-                @property
-                def errors(self):
-                    return [x.text for x in self.find_elements(*self._error_selector)]
-
-            @property
-            def errors(self):
-                error_items = [self.ErrorItem(self, x) for x in self.find_elements(*self._error_item_selector)]
-                errors = {}
-                for error in error_items:
-                    errors[error.field_name] = error.errors
-                return errors
 
         def remove_all_required(self):
             self.driver.execute_script("Array.from(document.getElementsByTagName(\"input\")).forEach(function (el, ind, arr) { el.removeAttribute(\"required\")});")