[Fusionforge-commits] FusionForge branch feature/ twig-template-engine updated. 90750c7 Fixed first cell

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Jun 11 12:41:42 CEST 2015


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, feature/twig-template-engine has been updated
       via  90750c7e132eff7e42d0b7a878d0a434c0f65d25 (commit)
       via  204e0aa7a717ce0c857e49350c53ffc02c84fb26 (commit)
      from  6026957a8b9a0b5352a3d8497b77c7c29aeb9835 (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 -----------------------------------------------------------------
commit 90750c7e132eff7e42d0b7a878d0a434c0f65d25
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jun 11 12:41:27 2015 +0200

    Fixed first cell

diff --git a/src/www/themes/funky-twig/Theme.class.php b/src/www/themes/funky-twig/Theme.class.php
index fc2598b..e3720ba 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -292,7 +292,8 @@ class Theme extends Layout {
 		}
 
 		$cells = array();
-		$cells[] = array(util_make_link('/', html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge Home'))), 'id' => 'header-col1');
+		$cells[] = array('text' => util_make_link('/', html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge Home'))),
+						 'attrs' => array('id' => 'header-col1'));
 		$items = $this->navigation->getUserLinks();
 		for ($j = 0; $j < count($items['titles']); $j++) {
 			$links[] = util_make_link($items['urls'][$j], $items['titles'][$j], array('class' => 'userlink'), true);

commit 204e0aa7a717ce0c857e49350c53ffc02c84fb26
Author: Roland Mas <lolando at debian.org>
Date:   Thu Jun 11 12:32:15 2015 +0200

    Added machinery to change theme in testsuite, test it in loginTest.php

diff --git a/tests/func/10_Site/loginTest.php b/tests/func/10_Site/loginTest.php
index 3c59240..3798712 100644
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@ -122,7 +122,8 @@ class LoginProcess extends FForge_SeleniumTestCase
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("Forge Admin"));
 		$this->assertTrue($this->isTextPresent("Log Out"));
-		$this->assertTrue($this->isTextPresent("Log Out"));
+
+		$this->changeTheme("Funky Twig");
 	}
 }
 
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index 271c248..0cbd925 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -291,6 +291,13 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$this->triggeredLogin($username);
 	}
 
+	protected function changeTheme($theme)
+	{
+		$this->clickAndWait("link=My Account");
+		$this->select("//select[@name='theme_id']","label=$theme");
+		$this->clickAndWait("submit");
+	}
+
 	protected function triggeredLogin($username)
 	{
 		if ($username == FORGE_ADMIN_USERNAME) {

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

Summary of changes:
 src/www/themes/funky-twig/Theme.class.php | 3 ++-
 tests/func/10_Site/loginTest.php          | 3 ++-
 tests/func/Testing/SeleniumForge.php      | 7 +++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/www/themes/funky-twig/Theme.class.php b/src/www/themes/funky-twig/Theme.class.php
index fc2598b..e3720ba 100644
--- a/src/www/themes/funky-twig/Theme.class.php
+++ b/src/www/themes/funky-twig/Theme.class.php
@@ -292,7 +292,8 @@ class Theme extends Layout {
 		}
 
 		$cells = array();
-		$cells[] = array(util_make_link('/', html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge Home'))), 'id' => 'header-col1');
+		$cells[] = array('text' => util_make_link('/', html_image('/header/top-logo.png', null, null, array('alt'=>'FusionForge Home'))),
+						 'attrs' => array('id' => 'header-col1'));
 		$items = $this->navigation->getUserLinks();
 		for ($j = 0; $j < count($items['titles']); $j++) {
 			$links[] = util_make_link($items['urls'][$j], $items['titles'][$j], array('class' => 'userlink'), true);
diff --git a/tests/func/10_Site/loginTest.php b/tests/func/10_Site/loginTest.php
index 3c59240..3798712 100644
--- a/tests/func/10_Site/loginTest.php
+++ b/tests/func/10_Site/loginTest.php
@@ -122,7 +122,8 @@ class LoginProcess extends FForge_SeleniumTestCase
 		$this->waitForPageToLoad("30000");
 		$this->assertTrue($this->isTextPresent("Forge Admin"));
 		$this->assertTrue($this->isTextPresent("Log Out"));
-		$this->assertTrue($this->isTextPresent("Log Out"));
+
+		$this->changeTheme("Funky Twig");
 	}
 }
 
diff --git a/tests/func/Testing/SeleniumForge.php b/tests/func/Testing/SeleniumForge.php
index 271c248..0cbd925 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -291,6 +291,13 @@ class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 		$this->triggeredLogin($username);
 	}
 
+	protected function changeTheme($theme)
+	{
+		$this->clickAndWait("link=My Account");
+		$this->select("//select[@name='theme_id']","label=$theme");
+		$this->clickAndWait("submit");
+	}
+
 	protected function triggeredLogin($username)
 	{
 		if ($username == FORGE_ADMIN_USERNAME) {


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list