Hello,

please review these patches. First four of them fixes patches and the last one fixes small bug in WebUI which causes that some tests fail.


https://fedorahosted.org/freeipa/ticket/6050

https://fedorahosted.org/freeipa/ticket/6052

https://fedorahosted.org/freeipa/ticket/6053

https://fedorahosted.org/freeipa/ticket/6054


--
Pavel^3 Vomacka

From 1f2bd1df86a27e732dd5414c4649d4a4a7f98eb8 Mon Sep 17 00:00:00 2001
From: Pavel Vomacka <pvoma...@redhat.com>
Date: Mon, 11 Jul 2016 14:39:54 +0200
Subject: [PATCH 1/5] Close host adder dialog before showing 4304 dialog

The adder dialog window stayed opened but not visible. This patch closes it.

https://fedorahosted.org/freeipa/ticket/6050
---
 install/ui/src/freeipa/rpc.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/install/ui/src/freeipa/rpc.js b/install/ui/src/freeipa/rpc.js
index a185585f4176658e299e7e92434522c936cc36b4..f538e103352b0605518548f94fb9199f874da625 100644
--- a/install/ui/src/freeipa/rpc.js
+++ b/install/ui/src/freeipa/rpc.js
@@ -976,6 +976,7 @@ rpc.create_4304_error_handler = function(adder_dialog) {
         var dialog = null;
 
         if (data && data.error && data.error.code === 4304) {
+            adder_dialog.close();
             dialog = IPA.message_dialog({
                 name: 'error_4304_info',
                 message: data.error.message,
-- 
2.5.5

From 7075ffb548d197b0c00ecdd5702a600a4d47c3ac Mon Sep 17 00:00:00 2001
From: tester <t...@example.com>
Date: Mon, 11 Jul 2016 16:14:44 +0200
Subject: [PATCH 3/5] Fix test_navigation tests

Some menu item names has changed. This commit sets the correct names.

https://fedorahosted.org/freeipa/ticket/6053
---
 ipatests/test_webui/test_navigation.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ipatests/test_webui/test_navigation.py b/ipatests/test_webui/test_navigation.py
index b5dc928ac4d631fb1fc8f9ea4b0d7ddbc213e5dc..b51d71d03caa3f7f0f5abfc0939e9b41cd471037 100644
--- a/ipatests/test_webui/test_navigation.py
+++ b/ipatests/test_webui/test_navigation.py
@@ -107,7 +107,7 @@ class test_navigation(UI_driver):
         # Identity
         # don't start by users (default)
         self.navigate_by_menu('identity/group', False)
-        self.navigate_by_menu('identity/user', False)
+        self.navigate_by_menu('identity/user_search', False)
         self.navigate_by_menu('identity/host', False)
         self.navigate_by_menu('identity/hostgroup', False)
         self.navigate_by_menu('identity/netgroup', False)
@@ -136,9 +136,9 @@ class test_navigation(UI_driver):
         self.navigate_by_menu('authentication/radiusproxy', False)
         self.navigate_by_menu('authentication/otptoken', False)
         if self.has_ca():
-            self.navigate_by_menu('authentication/cert', False)
+            self.navigate_by_menu('authentication/cert_search', False)
         else:
-            self.assert_menu_item('authentication/cert', False)
+            self.assert_menu_item('authentication/cert_search', False)
 
         # Network Services
         self.navigate_by_menu('network_services')
-- 
2.5.5

From 69e5d07d40927ca28ac432c35888d2338d78d6ea Mon Sep 17 00:00:00 2001
From: tester <t...@example.com>
Date: Mon, 11 Jul 2016 16:16:09 +0200
Subject: [PATCH 4/5] Fix test which checks removing of user

The name of delete action is now 'delete_active_user' not just 'delete' therefore
tests needs to be fixed.

https://fedorahosted.org/freeipa/ticket/6052
---
 ipatests/test_webui/test_user.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ipatests/test_webui/test_user.py b/ipatests/test_webui/test_user.py
index 5b509d18ca9a0738af1595678fd56ba57d405079..e926c22123ab449db2c3c061e500fa6e137d875d 100644
--- a/ipatests/test_webui/test_user.py
+++ b/ipatests/test_webui/test_user.py
@@ -161,7 +161,7 @@ class test_user(UI_driver):
         self.action_list_action('unlock')
 
         # delete
-        self.delete_action(user.ENTITY, user.PKEY)
+        self.delete_action(user.ENTITY, user.PKEY, action='delete_active_user')
 
     @screenshot
     def test_password_expiration_notification(self):
-- 
2.5.5

From 185b0ed54b9a476002860c6902503745fabec378 Mon Sep 17 00:00:00 2001
From: tester <t...@example.com>
Date: Mon, 11 Jul 2016 16:17:30 +0200
Subject: [PATCH 5/5] Set default delete action name to 'delete'

Only specific delete actions will be explicitely set.

Part of: https://fedorahosted.org/freeipa/ticket/6052
---
 ipatests/test_webui/ui_driver.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/ipatests/test_webui/ui_driver.py b/ipatests/test_webui/ui_driver.py
index 40cdad3c794a98f5f1648d3338b917084db2e3ed..7c4ca75efa3e642f4a2c0cdcd72be3cafa3c305a 100644
--- a/ipatests/test_webui/ui_driver.py
+++ b/ipatests/test_webui/ui_driver.py
@@ -1289,7 +1289,6 @@ class UI_driver(object):
                         )
 
         # Find
-
         self.find_record(parent_entity, data, search_facet)
 
         # 3. Navigate to details facet
@@ -1458,11 +1457,11 @@ class UI_driver(object):
         self.assert_no_error_dialog()
         self.assert_class(title, 'disabled')
 
-    def delete_action(self, entity, pkey, facet='search'):
+    def delete_action(self, entity, pkey, action='delete', facet='search'):
         """
         Execute and test 'delete' action panel action.
         """
-        self.action_list_action('delete')
+        self.action_list_action(action)
         self.wait_for_request(n=4)
         self.assert_no_error_dialog()
         self.assert_facet(entity, facet)
-- 
2.5.5

From 69e3822c1e5c77e7543b7b694264276dce811cbe Mon Sep 17 00:00:00 2001
From: tester <t...@example.com>
Date: Mon, 11 Jul 2016 16:13:44 +0200
Subject: [PATCH 2/5] Remove navigation using breadcrumb menus

https://fedorahosted.org/freeipa/ticket/6054
---
 ipatests/test_webui/test_automember.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/ipatests/test_webui/test_automember.py b/ipatests/test_webui/test_automember.py
index 9f3da1e9693ec8f8a924b9e81545161eb2af44c9..5b07849b82b09177093a5bfeaa11780af419ac3c 100644
--- a/ipatests/test_webui/test_automember.py
+++ b/ipatests/test_webui/test_automember.py
@@ -159,7 +159,6 @@ class test_automember(UI_driver):
 
         # Rebuild membership for all hosts, using action on hosts search facet
         self.navigate_by_menu('identity/host')
-        self.navigate_by_breadcrumb('Hosts')
         self.action_list_action('automember_rebuild')
 
         # Assert that hosts are now members of hostgroup
@@ -256,8 +255,7 @@ class test_automember(UI_driver):
         self.assert_record('dev2', negative=True)
 
         # Rebuild membership for all users, using action on users search facet
-        self.navigate_by_menu('identity/user')
-        self.navigate_by_breadcrumb('Users')
+        self.navigate_by_menu('identity/user_search')
         self.action_list_action('automember_rebuild')
 
         # Assert that users are now members of group
-- 
2.5.5

-- 
Manage your subscription for the Freeipa-devel mailing list:
https://www.redhat.com/mailman/listinfo/freeipa-devel
Contribute to FreeIPA: http://www.freeipa.org/page/Contribute/Code

Reply via email to