summaryrefslogtreecommitdiffstats
path: root/ipatests
diff options
context:
space:
mode:
authorPetr Vobornik <pvoborni@redhat.com>2013-10-17 10:28:47 +0200
committerMartin Kosek <mkosek@redhat.com>2014-01-21 12:04:02 +0100
commit7adb034e02c7a2a23f52d96d366273cc76e4717f (patch)
tree547b3549c7113c875fbe612c9f5c9db43cbed9dd /ipatests
parent1aeb2bb11def325b4e065862b2841e4c44e7f888 (diff)
downloadfreeipa-7adb034e02c7a2a23f52d96d366273cc76e4717f.tar.gz
freeipa-7adb034e02c7a2a23f52d96d366273cc76e4717f.tar.xz
freeipa-7adb034e02c7a2a23f52d96d366273cc76e4717f.zip
Remove jquery button usage and unify button code
https://fedorahosted.org/freeipa/ticket/3904
Diffstat (limited to 'ipatests')
-rw-r--r--ipatests/test_webui/ui_driver.py7
1 files changed, 5 insertions, 2 deletions
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()