diff --git a/airgun/entities/subscription.py b/airgun/entities/subscription.py index 6e2f89c1a..7e0357742 100644 --- a/airgun/entities/subscription.py +++ b/airgun/entities/subscription.py @@ -176,7 +176,7 @@ def delete(self, entity_name): def read_subscriptions(self): """Return subscriptions table""" view = self.navigate_to(self, 'All') - view.wait_displayed(timeout=10, delay=1) + view.wait_displayed(timeout=60, delay=10) return view.table.read() diff --git a/airgun/views/subscription.py b/airgun/views/subscription.py index cd3fcb24f..6a671ee27 100644 --- a/airgun/views/subscription.py +++ b/airgun/views/subscription.py @@ -137,12 +137,13 @@ class SubscriptionListView(BaseLoggedInView, SubscriptionSearchableViewMixin): columns_filter_checkboxes = SubscriptionColumnsFilter( ".//form[div[contains(@class, 'filter')]]/div/i" ) + table_loading = Text("//h5[normalize-space(.)='Loading']") @property def is_displayed(self): return ( - self.browser.wait_for_element('div#subscriptions-table', timeout=10, exception=False) - is not None + self.browser.wait_for_element(self.table_loading, exception=False) is None + and self.browser.wait_for_element(self.table, exception=False) is not None ) def is_searchable(self):