[Fusionforge-commits] FusionForge branch master updated. v6.0.5-1191-g15b9bc2

Franck Villaume nerville at libremir.placard.fr.eu.org
Sun Dec 11 10:20:13 CET 2016


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  15b9bc27cade7d110d0241a70a57a1cf986b4fee (commit)
      from  36e441f888ac23c61ebe56556049169d1e6962d7 (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=15b9bc27cade7d110d0241a70a57a1cf986b4fee

commit 15b9bc27cade7d110d0241a70a57a1cf986b4fee
Author: Franck Villaume <franck.villaume at trivialdev.com>
Date:   Sun Dec 11 10:19:55 2016 +0100

    fix merge 6.0

diff --git a/tests/func/10_Site/loginTest.php b/tests/func/10_Site/loginTest.php
index 6a77cdd..595cb26 100644
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@ -162,7 +162,7 @@ class LoginProcess extends FForge_SeleniumTestCase
 		$this->assertTrue($this->isTextPresent("Forge Admin"));
 		$this->assertTrue($this->isTextPresent("Log Out"));
 		// Shorten session validity delay
-		$this->changeConfig("[core]\nsession_expire = 10\n");
+		$this->changeConfig(array("core" => array("session_expire" => "10")));
 		// Ensure session cookie is refreshed
 		sleep(5);
 		$this->open( ROOT );

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

Summary of changes:
 tests/func/10_Site/loginTest.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list