[Fusionforge-commits] FusionForge branch feature/concurrent-ssh-http-for-scm updated. 29ab12e64112c77175b4ca0de440421158494111

Roland Mas lolando at fusionforge.org
Fri Dec 5 13:33:23 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, feature/concurrent-ssh-http-for-scm has been updated
       via  29ab12e64112c77175b4ca0de440421158494111 (commit)
      from  23b89b40ee53e0c70162b9144bd6e5bdbf6f274b (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 29ab12e64112c77175b4ca0de440421158494111
Author: Roland Mas <lolando at debian.org>
Date:   Fri Dec 5 13:33:16 2014 +0100

    Cope with iframes

diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 76a9bbc..8a4245e 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -76,12 +76,14 @@ use_ssl = no
 		$this->assertEquals($ret, 0);
 
 		// Check that the changes appear in gitweb
-		$this->open(ROOT.'/plugins/scmgit/cgi-bin/gitweb.cgi?a=project_list;pf=projecta');
-		$this->waitForPageToLoad();
+		$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->click("link=projecta/projecta.git");
-		$this->waitForPageToLoad();
+		$this->clickAndWait("link=projecta.git");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextPresent("Adding file");
 
diff --git a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
index 67ef78f..aaa2044 100644
--- a/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
+++ b/tests/func/50_PluginsScmSvn/svnWebDAVTest.php
@@ -75,6 +75,7 @@ class ScmSvnWebDAVTest extends FForge_SeleniumTestCase
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
 		$this->clickAndWait("link=Browse Subversion Repository");
+        $this->selectFrame("id=scmsvn_iframe");
 		$this->assertTextPresent("Modifying file");
 		$this->assertTextNotPresent("Adding file");
 

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

Summary of changes:
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php |   10 ++++++----
 tests/func/50_PluginsScmSvn/svnWebDAVTest.php    |    1 +
 2 files changed, 7 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list