This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "FusionForge".

The branch, master has been updated
       via  2bd226841c7d4fb489d9703fe083dffd756f77a7 (commit)
      from  3a9a2d19cb0428a5ca0cafcf62a764c530160f1f (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://scm.fusionforge.org/anonscm/gitweb/?p=fusionforge/fusionforge.git;a=commitdiff;h=2bd226841c7d4fb489d9703fe083dffd756f77a7

commit 2bd226841c7d4fb489d9703fe083dffd756f77a7
Author: Franck Villaume <[email protected]>
Date:   Fri Dec 2 11:47:12 2016 +0100

    fix test with fieldset support

diff --git a/tests/func/30_RBAC/rbacTest.php b/tests/func/30_RBAC/rbacTest.php
index a1947a4..ebd64c3 100644
--- a/tests/func/30_RBAC/rbacTest.php
+++ b/tests/func/30_RBAC/rbacTest.php
@@ -338,28 +338,28 @@ class RBAC extends FForge_SeleniumTestCase
                $this->click("link=Users and permissions");
                $this->waitForPageToLoad("30000");
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "guru") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Senior Developer");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Senior Developer");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("guru Lastname"));
                $this->assertTrue($this->isElementPresent("//tr/td/a[.='guru 
Lastname']/../../td/div[contains(.,'Senior Developer')]")) ;
 
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "trainee") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Junior Developer");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Junior Developer");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("trainee Lastname"));
                $this->assertTrue($this->isElementPresent("//tr/td/a[.='trainee 
Lastname']/../../td/div[contains(.,'Junior Developer')]")) ;
 
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "docmaster") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Doc Writer");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Doc Writer");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("docmaster Lastname"));
                
$this->assertTrue($this->isElementPresent("//tr/td/a[.='docmaster 
Lastname']/../../td/div[contains(.,'Doc Writer')]")) ;
 
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "bigboss") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Senior Developer");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Senior Developer");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("bigboss Lastname"));
@@ -376,7 +376,7 @@ class RBAC extends FForge_SeleniumTestCase
                $this->assertFalse($this->isTextPresent("trainee Lastname"));
 
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "trainee") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Junior Developer");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Junior Developer");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("trainee Lastname"));
@@ -512,7 +512,7 @@ class RBAC extends FForge_SeleniumTestCase
                $this->click("link=Users and permissions");
                $this->waitForPageToLoad("30000");
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "guru") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Admin");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Admin");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("guru Lastname"));
@@ -547,7 +547,7 @@ class RBAC extends FForge_SeleniumTestCase
                $this->waitForPageToLoad("30000");
                $this->assertTrue($this->isTextPresent("Temporary role"));
                $this->type 
("//form[contains(@action,'users.php')]//input[@name='form_unix_name' and 
@type='text']", "trainee") ;
-               $this->select("//input[@value='Add 
Member']/../select[@name='role_id']", "label=Temporary role");
+               $this->select("//input[@value='Add 
Member']/../fieldset/select[@name='role_id']", "label=Temporary role");
                $this->click ("//input[@value='Add Member']") ;
                $this->waitForPageToLoad("30000");
                $this->click ("//td/form/div[contains(.,'Temporary 
role')]/../../form/div/input[@value='Delete role']") ;

-----------------------------------------------------------------------

Summary of changes:
 tests/func/30_RBAC/rbacTest.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to