diff --git a/airgun/entities/http_proxy.py b/airgun/entities/http_proxy.py index 7c0ad5bbd..308041769 100644 --- a/airgun/entities/http_proxy.py +++ b/airgun/entities/http_proxy.py @@ -64,7 +64,7 @@ class ShowAllHTTPProxy(NavigateStep): @retry_navigation def step(self, *args, **kwargs): - self.view.menu.select('Infrastructure', 'HTTP Proxies') + self.view.menu.select('Infrastructure', 'HTTP proxies') @navigator.register(HTTPProxyEntity, 'New') diff --git a/airgun/views/http_proxy.py b/airgun/views/http_proxy.py index af1d86134..2dd94f9fc 100644 --- a/airgun/views/http_proxy.py +++ b/airgun/views/http_proxy.py @@ -1,4 +1,4 @@ -from widgetastic.widget import Table, Text, TextInput, View +from widgetastic.widget import Checkbox, Table, Text, TextInput, View from widgetastic_patternfly import BreadCrumb from airgun.views.common import BaseLoggedInView, SatTab, SearchableViewMixin @@ -6,8 +6,8 @@ class HTTPProxyView(BaseLoggedInView, SearchableViewMixin): - title = Text('//*[(self::h1 or self::h5) and normalize-space(.)="HTTP Proxies"]') - new = Text('//a[normalize-space(.)="New HTTP Proxy"]') + title = Text('//*[(self::h1 or self::h5) and normalize-space(.)="HTTP proxies"]') + new = Text('//a[normalize-space(.)="New HTTP proxy"]') table = Table( './/table', column_widgets={ @@ -32,8 +32,8 @@ def is_displayed(self): breadcrumb_loaded = self.browser.wait_for_element(self.breadcrumb, exception=False) return ( breadcrumb_loaded - and self.breadcrumb.locations[0] == 'HTTP Proxies' - and self.breadcrumb.read() == 'New HTTP Proxy' + and self.breadcrumb.locations[0] == 'HTTP proxies' + and self.breadcrumb.read() == 'New HTTP proxy' ) @View.nested @@ -46,6 +46,7 @@ class http_proxy(SatTab): password = TextInput(id='http_proxy_password') test_url = TextInput(id='http_proxy_test_url') test_connection = Text('//a[@id="test_connection_button"]') + content_default_http_proxy = Checkbox(id='content_default_http_proxy') @View.nested class locations(SatTab): @@ -62,6 +63,6 @@ def is_displayed(self): breadcrumb_loaded = self.browser.wait_for_element(self.breadcrumb, exception=False) return ( breadcrumb_loaded - and self.breadcrumb.locations[0] == 'Http Proxies' + and self.breadcrumb.locations[0] == 'Http proxies' and self.breadcrumb.read().startswith('Edit ') )