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 42470f226f1793c6458afdc0cf19d2cc8e3f187e (commit)
from 2bd226841c7d4fb489d9703fe083dffd756f77a7 (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=42470f226f1793c6458afdc0cf19d2cc8e3f187e
commit 42470f226f1793c6458afdc0cf19d2cc8e3f187e
Author: Franck Villaume <[email protected]>
Date: Fri Dec 2 12:47:17 2016 +0100
fix test post IE hack
diff --git a/tests/func/30_RBAC/rbacTest.php b/tests/func/30_RBAC/rbacTest.php
index ebd64c3..c998169 100644
--- a/tests/func/30_RBAC/rbacTest.php
+++ b/tests/func/30_RBAC/rbacTest.php
@@ -466,7 +466,7 @@ class RBAC extends FForge_SeleniumTestCase
$this->click("link=Users and permissions");
$this->waitForPageToLoad("30000");
- $this->assertTrue($this->isElementPresent("//input[@value='Link
external role']/../../div/select/option[.='Senior Developer (in project
MetaProject)']")) ;
+ $this->assertTrue($this->isElementPresent("//input[@value='Link
external role']/../../div/fieldset/select/option[.='Senior Developer (in
project MetaProject)']")) ;
$this->select("//input[@value='Link external
role']/../../div/select", "label=Senior Developer (in project MetaProject)") ;
$this->click("//input[@value='Link external role']") ;
$this->waitForPageToLoad("30000");
@@ -498,9 +498,9 @@ class RBAC extends FForge_SeleniumTestCase
$this->click("link=Users and permissions");
$this->waitForPageToLoad("30000");
- $this->assertTrue($this->isElementPresent("//input[@value='Link
external role']/../../div/select/option[.='Documentation masters (global
role)']")) ;
-
$this->assertFalse($this->isElementPresent("//input[@value='Link external
role']/../../div/select/option[.='Project moderators (global role)']")) ;
- $this->select("//input[@value='Link external
role']/../../div/select", "label=Documentation masters (global role)") ;
+ $this->assertTrue($this->isElementPresent("//input[@value='Link
external role']/../../div/fieldset/select/option[.='Documentation masters
(global role)']")) ;
+
$this->assertFalse($this->isElementPresent("//input[@value='Link external
role']/../../div/fieldset/select/option[.='Project moderators (global
role)']")) ;
+ $this->select("//input[@value='Link external
role']/../../div/fieldset/select", "label=Documentation masters (global role)")
;
$this->click("//input[@value='Link external role']") ;
$this->waitForPageToLoad("30000");
$this->assertTrue($this->isElementPresent("//td/form/div[contains(.,'Documentation
masters (global role)')]/../div/input[contains(@value,'Unlink Role')]"));
@@ -610,19 +610,19 @@ class RBAC extends FForge_SeleniumTestCase
$this->click
("//td/form/div[contains(.,'Anonymous')]/../div/input[@value='Edit
Permissions']") ;
$this->waitForPageToLoad("30000");
- $this->select("//tr/td[contains(.,'first-news')]/../td/select",
"label=Read only");
+
$this->select("//tr/td[contains(.,'first-news')]/../td/fieldset/select",
"label=Read only");
$this->click ("//input[@value='Submit']") ;
$this->waitForPageToLoad("30000");
-
$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/select", "Read
only");
+
$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/fieldset/select",
"Read only");
- $this->select("//tr/td[contains(.,'first-news')]/../td/select",
"label=Moderated post");
+
$this->select("//tr/td[contains(.,'first-news')]/../td/fieldset/select",
"label=Moderated post");
$this->click ("//input[@value='Submit']") ;
$this->waitForPageToLoad("30000");
-
$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/select",
"Moderated post");
+
$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/fieldset/select",
"Moderated post");
- $this->select("//tr/td[contains(.,'first-news')]/../td/select",
"label=Unmoderated post");
+
$this->select("//tr/td[contains(.,'first-news')]/../td/fieldset/select",
"label=Unmoderated post");
$this->click ("//input[@value='Submit']") ;
$this->waitForPageToLoad("30000");
-
$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/select",
"Unmoderated post");
+
$this->assertSelected("//tr/td[contains(.,'first-news')]/../td/fieldset/select",
"Unmoderated post");
}
}
-----------------------------------------------------------------------
Summary of changes:
tests/func/30_RBAC/rbacTest.php | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
hooks/post-receive
--
FusionForge
_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits
