From 7adb034e02c7a2a23f52d96d366273cc76e4717f Mon Sep 17 00:00:00 2001 From: Petr Vobornik Date: Thu, 17 Oct 2013 10:28:47 +0200 Subject: Remove jquery button usage and unify button code https://fedorahosted.org/freeipa/ticket/3904 --- ipatests/test_webui/ui_driver.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'ipatests/test_webui') diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py index dabe4a7db..65d14f9ae 100644 --- a/ipatests/test_webui/ui_driver.py +++ b/ipatests/test_webui/ui_driver.py @@ -583,12 +583,15 @@ class UI_driver(object): if not parent: parent = self.get_form() - s = "a[name='%s'].ui-button" % name + s = "[name='%s'].btn" % name self._button_click(s, parent, name) def _button_click(self, selector, parent, name=''): btn = self.find(selector, By.CSS_SELECTOR, parent, strict=True) - disabled = 'ui-state-disabled' in btn.get_attribute("class").split() + + disabled = 'ui-state-disabled' in btn.get_attribute("class").split() or \ + btn.get_attribute("disabled") + assert btn.is_displayed(), 'Button is not displayed: %s' % name assert not disabled, 'Invalid button state: disabled. Button: %s' % name btn.click() -- cgit