[Fusionforge-commits] FusionForge branch feature/git-smart-http-5.3 updated. c76c07f35ca2af5ed4a9f18c3bcff749c43ab9f5

Roland Mas lolando at fusionforge.org
Thu Apr 24 16:52:32 CEST 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/git-smart-http-5.3 has been updated
       via  c76c07f35ca2af5ed4a9f18c3bcff749c43ab9f5 (commit)
       via  969dfe944b32af6da7482e6d4124333fd273647a (commit)
      from  3ef92658ad42c23f98a30bec4ff296f1b91f961a (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 c76c07f35ca2af5ed4a9f18c3bcff749c43ab9f5
Author: Roland Mas <lolando at debian.org>
Date:   Thu Apr 24 16:18:37 2014 +0200

    Split scmgit testsuite into three parts

diff --git a/tests/func/PluginsScmGit/gitTest.php b/tests/func/PluginsScmGit/gitSSHTest.php
similarity index 61%
copy from tests/func/PluginsScmGit/gitTest.php
copy to tests/func/PluginsScmGit/gitSSHTest.php
index 5656f6d..ee976c6 100644
--- a/tests/func/PluginsScmGit/gitTest.php
+++ b/tests/func/PluginsScmGit/gitSSHTest.php
@@ -21,9 +21,9 @@
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumGforge.php';
 
-class ScmGitTest extends FForge_SeleniumTestCase
+class ScmGitSSHTest extends FForge_SeleniumTestCase
 {
-	function testScmGit()
+	function testScmGitSSH()
 	{
 		$this->activatePlugin('scmgit');
 		$this->populateStandardTemplate('empty');
@@ -37,51 +37,9 @@ class ScmGitTest extends FForge_SeleniumTestCase
 		$this->click("//input[@name='scmradio' and @value='scmgit']");
 		$this->clickAndWait("submit");
 	    
-		$this->type("//input[@name='repo_name']", "other-repo");
-		$this->type("//input[@name='description']", "Description for second repository");
-		$this->clickAndWait("//input[@value='Submit']");
-		$this->assertTextPresent("New repository other-repo registered");
-		
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->assertTextPresent("other-repo");
-
-		$this->assertTextPresent("Anonymous Access to the Git");
-		$this->clickAndWait("link=Request a personal repository");
-		$this->assertTextPresent("You have now requested a personal Git repository");
-
-		// Run the cronjob to create repositories
-		$this->cron("create_scm_repos.php");
-
-		$this->clickAndWait("link=SCM");
-		$this->assertTextPresent("Access to your personal repository");
-
-		$this->open(ROOT.'/plugins/scmgit/cgi-bin/gitweb.cgi?a=project_list;pf=projecta');
-		$this->waitForPageToLoad();
-		$this->assertElementPresent("//.[@class='page_footer']");
-		$this->assertTextPresent("projecta.git");
-		$this->assertTextPresent("other-repo.git");
-		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=Admin");
-		$this->clickAndWait("link=Tools");
-		$this->clickAndWait("link=Source Code Admin");
-		$this->clickAndWait("//form[@name='form_delete_repo_other-repo']/input[@value='Delete']");
-		$this->assertTextPresent("Repository other-repo is marked for deletion");
-
 		// Run the cronjob to create repositories
 		$this->cron("create_scm_repos.php");
 
-		$this->open(ROOT.'/plugins/scmgit/cgi-bin/gitweb.cgi?a=project_list;pf=projecta');
-		$this->waitForPageToLoad();
-		$this->assertElementPresent("//.[@class='page_footer']");
-		$this->assertTextPresent("projecta.git");
-		$this->assertTextNotPresent("other-repo.git");
-		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-
 		// Get the address of the repo
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
diff --git a/tests/func/PluginsScmGit/gitTest.php b/tests/func/PluginsScmGit/gitSmartHTTPTest.php
similarity index 60%
copy from tests/func/PluginsScmGit/gitTest.php
copy to tests/func/PluginsScmGit/gitSmartHTTPTest.php
index 5656f6d..b85458b 100644
--- a/tests/func/PluginsScmGit/gitTest.php
+++ b/tests/func/PluginsScmGit/gitSmartHTTPTest.php
@@ -21,9 +21,9 @@
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumGforge.php';
 
-class ScmGitTest extends FForge_SeleniumTestCase
+class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 {
-	function testScmGit()
+	function testScmGitSmartHTTP()
 	{
 		$this->activatePlugin('scmgit');
 		$this->populateStandardTemplate('empty');
@@ -37,56 +37,14 @@ class ScmGitTest extends FForge_SeleniumTestCase
 		$this->click("//input[@name='scmradio' and @value='scmgit']");
 		$this->clickAndWait("submit");
 	    
-		$this->type("//input[@name='repo_name']", "other-repo");
-		$this->type("//input[@name='description']", "Description for second repository");
-		$this->clickAndWait("//input[@value='Submit']");
-		$this->assertTextPresent("New repository other-repo registered");
-		
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=SCM");
-		$this->assertTextPresent("other-repo");
-
-		$this->assertTextPresent("Anonymous Access to the Git");
-		$this->clickAndWait("link=Request a personal repository");
-		$this->assertTextPresent("You have now requested a personal Git repository");
-
-		// Run the cronjob to create repositories
-		$this->cron("create_scm_repos.php");
-
-		$this->clickAndWait("link=SCM");
-		$this->assertTextPresent("Access to your personal repository");
-
-		$this->open(ROOT.'/plugins/scmgit/cgi-bin/gitweb.cgi?a=project_list;pf=projecta');
-		$this->waitForPageToLoad();
-		$this->assertElementPresent("//.[@class='page_footer']");
-		$this->assertTextPresent("projecta.git");
-		$this->assertTextPresent("other-repo.git");
-		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-
-		$this->open(ROOT);
-		$this->clickAndWait("link=ProjectA");
-		$this->clickAndWait("link=Admin");
-		$this->clickAndWait("link=Tools");
-		$this->clickAndWait("link=Source Code Admin");
-		$this->clickAndWait("//form[@name='form_delete_repo_other-repo']/input[@value='Delete']");
-		$this->assertTextPresent("Repository other-repo is marked for deletion");
-
 		// Run the cronjob to create repositories
 		$this->cron("create_scm_repos.php");
 
-		$this->open(ROOT.'/plugins/scmgit/cgi-bin/gitweb.cgi?a=project_list;pf=projecta');
-		$this->waitForPageToLoad();
-		$this->assertElementPresent("//.[@class='page_footer']");
-		$this->assertTextPresent("projecta.git");
-		$this->assertTextNotPresent("other-repo.git");
-		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-
 		// Get the address of the repo
 		$this->open(ROOT);
 		$this->clickAndWait("link=ProjectA");
 		$this->clickAndWait("link=SCM");
-		$p = $this->getText("//tt[contains(.,'git clone git+ssh')]");
+		$p = $this->getText("//tt[contains(.,'git clone http')]");
 		$p = preg_replace(",^git clone ,", "", $p);
 		$p = preg_replace(",://.*@,", "://root@", $p);
 
diff --git a/tests/func/PluginsScmGit/gitTest.php b/tests/func/PluginsScmGit/gitWUITest.php
similarity index 70%
rename from tests/func/PluginsScmGit/gitTest.php
rename to tests/func/PluginsScmGit/gitWUITest.php
index 5656f6d..704ef36 100644
--- a/tests/func/PluginsScmGit/gitTest.php
+++ b/tests/func/PluginsScmGit/gitWUITest.php
@@ -21,9 +21,9 @@
 
 require_once dirname(dirname(__FILE__)).'/Testing/SeleniumGforge.php';
 
-class ScmGitTest extends FForge_SeleniumTestCase
+class ScmGitWUITest extends FForge_SeleniumTestCase
 {
-	function testScmGit()
+	function testScmGitWUI()
 	{
 		$this->activatePlugin('scmgit');
 		$this->populateStandardTemplate('empty');
@@ -81,40 +81,6 @@ class ScmGitTest extends FForge_SeleniumTestCase
 		$this->assertTextPresent("projecta.git");
 		$this->assertTextNotPresent("other-repo.git");
 		$this->assertTextPresent("users/".FORGE_ADMIN_USERNAME.".git");
-
-		// Get the address of the repo
-		$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);
-
-		// Create a local clone, add stuff, push it to the repo
-		$t = exec("mktemp -d /tmp/gitTest.XXXXXX");
-		system("cd $t && git clone --quiet $p", $ret);
-		$this->assertEquals($ret, 0);
-
-		system("echo 'this is a simple text' > $t/projecta/mytext.txt");
-		system("cd $t/projecta && git add mytext.txt && git commit --quiet -a -m'Adding file'", $ret);
-		system("echo 'another simple text' >> $t/projecta/mytext.txt");
-		system("cd $t/projecta && git commit --quiet -a -m'Modifying file'", $ret);
-		$this->assertEquals($ret, 0);
-
-		system("cd $t/projecta && git push --quiet --all", $ret);
-		$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->assertElementPresent("//.[@class='page_footer']");
-		$this->assertTextPresent("projecta.git");
-		$this->click("link=projecta/projecta.git");
-		$this->waitForPageToLoad();
-		$this->assertTextPresent("Modifying file");
-		$this->assertTextPresent("Adding file");
-
-		system("rm -fr $t");
 	}
 
 	/**

commit 969dfe944b32af6da7482e6d4124333fd273647a
Author: Roland Mas <lolando at debian.org>
Date:   Thu Apr 24 14:53:50 2014 +0200

    Install missing modules

diff --git a/src/install/deps b/src/install/deps
index 4d155fa..cf76489 100644
--- a/src/install/deps
+++ b/src/install/deps
@@ -81,6 +81,7 @@ deps_debian() {
 	apt-get -y --force-yes install python-moinmoin python-psycopg2 python-pygments libapache2-mod-wsgi
 	apt-get -y --force-yes install mediawiki
 	apt-get -y --force-yes install git gitweb
+	apt-get -y --force-yes install libapache2-mpm-itk
 	a2enmod headers
 	a2enmod proxy
 	a2enmod ssl
diff --git a/src/install/install5_post b/src/install/install5_post
index d8ea1b4..9a62e39 100644
--- a/src/install/install5_post
+++ b/src/install/install5_post
@@ -31,7 +31,7 @@ install5_post_suse()
 	chkconfig -s postgresql on
 
 	# Apache settings: modules
-	for m in dav dav_svn authz_svn ssl; do
+	for m in dav dav_svn authz_svn ssl macro authz_groupfile; do
 		a2enmod $m
 		a2enflag $m
 	done
@@ -73,7 +73,7 @@ install5_post_debian()
         done
 
 	# Apache settings: modules
-	for m in dav dav_svn authz_svn ssl; do
+	for m in dav dav_svn authz_svn ssl macro authz_groupfile; do
 		a2enmod $m
 	done
 

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

Summary of changes:
 src/install/deps                                   |    1 +
 src/install/install5_post                          |    4 +-
 .../PluginsScmGit/{gitTest.php => gitSSHTest.php}  |   46 +------------------
 .../{gitTest.php => gitSmartHTTPTest.php}          |   48 ++------------------
 .../PluginsScmGit/{gitTest.php => gitWUITest.php}  |   38 +---------------
 5 files changed, 10 insertions(+), 127 deletions(-)
 copy tests/func/PluginsScmGit/{gitTest.php => gitSSHTest.php} (61%)
 copy tests/func/PluginsScmGit/{gitTest.php => gitSmartHTTPTest.php} (60%)
 rename tests/func/PluginsScmGit/{gitTest.php => gitWUITest.php} (70%)


hooks/post-receive
-- 
FusionForge



More information about the Fusionforge-commits mailing list