summaryrefslogtreecommitdiffstats
path: root/install/ui/test
diff options
context:
space:
mode:
authorEndi S. Dewata <edewata@redhat.com>2011-06-07 20:48:20 -0500
committerAdam Young <ayoung@redhat.com>2011-06-13 09:23:29 -0400
commit9704adfe44c915de97f416c18bcaeabea2c927ba (patch)
tree92fc1e3eb8d3c4816c88750facedd52511ff7ea9 /install/ui/test
parentd2b483cbb3ca15a68115cf32cfaf89572259914e (diff)
downloadfreeipa-9704adfe44c915de97f416c18bcaeabea2c927ba.tar.gz
freeipa-9704adfe44c915de97f416c18bcaeabea2c927ba.tar.xz
freeipa-9704adfe44c915de97f416c18bcaeabea2c927ba.zip
Fixed resizing issues.
The UI has been modified to fix some resizing issues: Previously the height of facet content was roughly calculated using resize(). Now the height can be more accurately defined in CSS. Previously the UI width was fixed. The HTML layout and background images have been modified to support horizontal expansion if needed.
Diffstat (limited to 'install/ui/test')
-rw-r--r--install/ui/test/functional/user-password-reset.html4
-rw-r--r--install/ui/test/navigation_tests.js16
2 files changed, 13 insertions, 7 deletions
diff --git a/install/ui/test/functional/user-password-reset.html b/install/ui/test/functional/user-password-reset.html
index e242c85c3..dddf732da 100644
--- a/install/ui/test/functional/user-password-reset.html
+++ b/install/ui/test/functional/user-password-reset.html
@@ -53,12 +53,12 @@
</tr>
<tr>
<td>click</td>
- <td>xpath=/html/body/div[3]//button[1]</td>
+ <td>css=.ui-dialog button:nth-child(1)</td>
<td></td>
</tr>
<tr>
<td>waitForElementNotPresent</td>
- <td>xpath=/html/body/div[3]</td>
+ <td>css=.ui-dialog</td>
<td></td>
</tr>
<tr>
diff --git a/install/ui/test/navigation_tests.js b/install/ui/test/navigation_tests.js
index 9126fae3a..94d0e027c 100644
--- a/install/ui/test/navigation_tests.js
+++ b/install/ui/test/navigation_tests.js
@@ -87,7 +87,9 @@ test("Testing IPA.navigation.create().", function() {
ok(user_mock_called, "mock user setup was called");
ok(!group_mock_called, "mock group setup was not called because the tab is inactive");
- var level1_tabs = navigation_container.children('div');
+ var tabs_container = navigation_container.children('div');
+
+ var level1_tabs = tabs_container.children('div');
same(level1_tabs.length, 1, "One level 1 tab");
var identity_tab = level1_tabs.first();
@@ -140,13 +142,15 @@ test("Testing IPA.navigation.update() with valid index.", function() {
navigation.push_state({'identity': 'two'});
navigation.update();
+ var tabs_container = navigation_container.children('div');
+
same(
- navigation_container.tabs('option', 'selected'), 0,
+ tabs_container.tabs('option', 'selected'), 0,
"Active tab at level 1"
);
same(
- $('.tabs[name=identity]', navigation_container).tabs('option', 'selected'), 1,
+ $('.tabs[name=identity]', tabs_container).tabs('option', 'selected'), 1,
"Active tab at level 2"
);
@@ -190,13 +194,15 @@ test("Testing IPA.navigation.update() with out-of-range index.", function() {
navigation.push_state({'identity': 'three'});
navigation.update();
+ var tabs_container = navigation_container.children('div');
+
same(
- navigation_container.tabs('option', 'selected'), 0,
+ tabs_container.tabs('option', 'selected'), 0,
"Active tab at level 1"
);
same(
- $('.tabs[name=identity]', navigation_container).tabs('option', 'selected'), 0,
+ $('.tabs[name=identity]', tabs_container).tabs('option', 'selected'), 0,
"Active tab at level 2"
);