diff --git a/airgun/views/subscription.py b/airgun/views/subscription.py index 14a38a3d0..34803eb19 100644 --- a/airgun/views/subscription.py +++ b/airgun/views/subscription.py @@ -10,27 +10,15 @@ from widgetastic_patternfly import BreadCrumb, Button from airgun.exceptions import ReadOnlyWidgetError -from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixin +from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixinPF4 from airgun.widgets import ( ConfirmationDialog, ItemsListReadOnly, ProgressBar, SatTable, - Search, ) -# Search field and button on Subscriptions page uses different locators, -# so subclass it and use it in our custom SearchableViewMixin -class SubscriptionSearch(Search): - search_field = TextInput(locator=(".//input[starts-with(@id, 'downshift-')]")) - search_button = Button('Search') - - -class SubscriptionSearchableViewMixin(SearchableViewMixin): - searchbox = SubscriptionSearch() - - class DeleteSubscriptionConfirmationDialog(ConfirmationDialog): confirm_dialog = Button('Delete') cancel_dialog = Button('Cancel') @@ -115,7 +103,7 @@ def fill(self, values): self.close() -class SubscriptionListView(BaseLoggedInView, SubscriptionSearchableViewMixin): +class SubscriptionListView(BaseLoggedInView, SearchableViewMixinPF4): """List of all subscriptions.""" table = SatSubscriptionsViewTable(