[Fusionforge-commits] FusionForge branch master updated. 70e8d4f732b1c4ae5a459aa75dcb7eeb160bd046

Roland Mas lolando at fusionforge.org
Fri Dec 5 16:52:17 CET 2014


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  70e8d4f732b1c4ae5a459aa75dcb7eeb160bd046 (commit)
      from  9148f13f25f5e04b5ed6dd1177849c527a8d3785 (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 70e8d4f732b1c4ae5a459aa75dcb7eeb160bd046
Author: Roland Mas <lolando at debian.org>
Date:   Fri Dec 5 16:52:12 2014 +0100

    Simplify test (and avoid bizarre cache (?) problems)

diff --git a/tests/func/55_PluginsScmMulti/multiSCMTest.php b/tests/func/55_PluginsScmMulti/multiSCMTest.php
index da0bcef..6acc8f3 100644
--- a/tests/func/55_PluginsScmMulti/multiSCMTest.php
+++ b/tests/func/55_PluginsScmMulti/multiSCMTest.php
@@ -52,38 +52,7 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->cron("scm/create_scm_repos.php");
 		$this->cron("shell/homedirs.php");
 
-		// Check Bazaar repo browser
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->clickAndWait("link=Browse Bazaar Repository");
-        $this->selectFrame("id=scmbzr_iframe");
-		$this->assertTextPresent("Browsing (root)");
-		$this->clickAndWait("link=projecta");
-		$this->assertTextPresent("Browsing (root)/projecta");
-        $this->selectFrame("relative=top");
-
-        // Check Subversion repo browser
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->clickAndWait("link=Browse Subversion Repository");
-        $this->selectFrame("id=scmsvn_iframe");
-		$this->assertTextPresent("trunk");
-		$this->assertTextPresent("Init");
-        $this->selectFrame("relative=top");
-
-        // Check Git repo browser
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->clickAndWait("link=Browse Git Repository");
-        $this->selectFrame("id=scmgit_iframe");
-		$this->assertElementPresent("//.[@class='page_footer']");
-		$this->assertTextPresent("projecta.git");
-        $this->selectFrame("relative=top");
-
-        // Check Bazaar commit/push/browse
+        // Check Bazaar commit/push
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
@@ -100,25 +69,9 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->assertEquals($ret, 0);
 		system("cd $t/trunk && bzr push --quiet $p/trunk", $ret);
 		$this->assertEquals($ret, 0);
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->clickAndWait("link=Browse Bazaar Repository");
-        $this->selectFrame("id=scmbzr_iframe");
-		$this->assertTextPresent("Browsing (root)");
-		$this->clickAndWait("link=projecta");
-		$this->assertTextPresent("Browsing (root)/projecta");
-		$this->assertTextPresent("trunk");
-		$this->clickAndWait("link=trunk");
-		$this->assertTextPresent("Modifying file in Bazaar");
-		$this->assertTextNotPresent("Adding file in Bazaar");
-		$this->clickAndWait("link=Changes");
-		$this->assertTextPresent("Modifying file in Bazaar");
-		$this->assertTextPresent("Adding file in Bazaar");
-        $this->selectFrame("relative=top");
 		system("rm -fr $t");
 
-        // Check Subversion checkout/commit/browse
+        // Check Subversion checkout/commit
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
@@ -132,23 +85,14 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		system("echo 'another simple text' >> $t/projecta/mytext.txt");
 		system("cd $t/projecta && svn commit -m'Modifying file in Subversion'", $ret);
 		$this->assertEquals($ret, 0);
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->clickAndWait("link=Browse Subversion Repository");
-        $this->selectFrame("id=scmsvn_iframe");
-		$this->assertTextPresent("Modifying file in Subversion");
-		$this->assertTextNotPresent("Adding file in Subversion");
-        $this->selectFrame("relative=top");
 		system("rm -fr $t");
 
-        // Check Git clone/commit/push/browse
+        // Check Git clone/commit/push
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$p = $this->getText("//tt[contains(.,'git clone git+ssh')]");
 		$p = preg_replace(",^git clone ,", "", $p);
-		$p = preg_replace(",://.*@,", "://root@", $p);
 		$t = exec("mktemp -d /tmp/gitTest.XXXXXX");
 		system("cd $t && git clone --quiet $p", $ret);
 		$this->assertEquals($ret, 0);
@@ -159,6 +103,38 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->assertEquals($ret, 0);
 		system("cd $t/projecta && git push --quiet --all", $ret);
 		$this->assertEquals($ret, 0);
+		system("rm -fr $t");
+
+        // Check Bazaar browse
+		$this->open(ROOT);
+		$this->clickAndWait("link=ProjectA");
+		$this->clickAndWait("link=SCM");
+		$this->clickAndWait("link=Browse Bazaar Repository");
+        $this->selectFrame("id=scmbzr_iframe");
+		$this->assertTextPresent("Browsing (root)");
+		$this->clickAndWait("link=projecta");
+		$this->assertTextPresent("Browsing (root)/projecta");
+		$this->assertTextPresent("trunk");
+		$this->clickAndWait("link=trunk");
+		$this->assertTextPresent("Modifying file in Bazaar");
+		$this->assertTextNotPresent("Adding file in Bazaar");
+		$this->clickAndWait("link=Changes");
+		$this->assertTextPresent("Modifying file in Bazaar");
+		$this->assertTextPresent("Adding file in Bazaar");
+        $this->selectFrame("relative=top");
+
+        // Check Subversion browse
+		$this->open(ROOT);
+		$this->clickAndWait("link=ProjectA");
+		$this->clickAndWait("link=SCM");
+		$this->clickAndWait("link=Browse Subversion Repository");
+        $this->selectFrame("id=scmsvn_iframe");
+		$this->assertTextPresent("trunk");
+		$this->assertTextPresent("Init");
+		$this->assertTextPresent("Modifying file in Subversion");
+        $this->selectFrame("relative=top");
+
+        // Check Git browse
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
@@ -170,8 +146,7 @@ class multiSCMTest extends FForge_SeleniumTestCase
 		$this->assertTextPresent("Modifying file in Git");
 		$this->assertTextPresent("Adding file in Git");
         $this->selectFrame("relative=top");
-		system("rm -fr $t");
-    }
+}
 
 	/**
 	 * Method that is called after Selenium actions.

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

Summary of changes:
 tests/func/55_PluginsScmMulti/multiSCMTest.php |   97 +++++++++---------------
 1 file changed, 36 insertions(+), 61 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list