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, 6.0 has been updated
       via  300158ba2e380ac16ce445f208f2814298a6ab8e (commit)
      from  74c8d5eafb58369ece86350d2f49f6b74cc41614 (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=300158ba2e380ac16ce445f208f2814298a6ab8e

commit 300158ba2e380ac16ce445f208f2814298a6ab8e
Author: Sylvain Beucler <[email protected]>
Date:   Fri Sep 4 11:48:32 2015 +0200

    testsuite: introduce cacheable fixtures ("projecta")

diff --git a/tests/func/50_PluginsScmGit/gitSSHTest.php 
b/tests/func/50_PluginsScmGit/gitSSHTest.php
index 2545d9d..e74e4bb 100644
--- a/tests/func/50_PluginsScmGit/gitSSHTest.php
+++ b/tests/func/50_PluginsScmGit/gitSSHTest.php
@@ -23,11 +23,13 @@ require_once 
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class ScmGitSSHTest extends FForge_SeleniumTestCase
 {
+       public $fixture = 'projecta';
+
        function testScmGitSSH()
        {
+               $this->loadAndCacheFixture();
+
                $this->activatePlugin('scmgit');
-               $this->populateStandardTemplate('empty');
-               $this->init();
 
                $this->open(ROOT);
                $this->clickAndWait("link=ProjectA");
diff --git a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php 
b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
index 470b978..308e193 100644
--- a/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
+++ b/tests/func/50_PluginsScmGit/gitSmartHTTPTest.php
@@ -23,13 +23,15 @@ require_once 
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class ScmGitSmartHTTPTest extends FForge_SeleniumTestCase
 {
+       public $fixture = 'projecta';
+
        function testScmGitSmartHTTP()
        {
+               $this->loadAndCacheFixture();
+
                $this->changeConfig("[core]\nuse_ssl = no\n");
 
                $this->activatePlugin('scmgit');
-               $this->populateStandardTemplate('empty');
-               $this->init();
 
                $this->open(ROOT);
                $this->clickAndWait("link=ProjectA");
diff --git a/tests/func/50_PluginsScmGit/gitWUITest.php 
b/tests/func/50_PluginsScmGit/gitWUITest.php
index f1950e9..c256ef6 100644
--- a/tests/func/50_PluginsScmGit/gitWUITest.php
+++ b/tests/func/50_PluginsScmGit/gitWUITest.php
@@ -23,11 +23,13 @@ require_once 
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 
 class ScmGitWUITest extends FForge_SeleniumTestCase
 {
+       public $fixture = 'projecta';
+
        function testScmGitWUI()
        {
+               $this->loadAndCacheFixture();
+
                $this->activatePlugin('scmgit');
-               $this->populateStandardTemplate('empty');
-               $this->init();
 
                $this->open(ROOT);
                $this->clickAndWait("link=ProjectA");
diff --git a/tests/func/60_PluginsBlocks/blocksTest.php 
b/tests/func/60_PluginsBlocks/blocksTest.php
index 58a74cd..b335323 100644
--- a/tests/func/60_PluginsBlocks/blocksTest.php
+++ b/tests/func/60_PluginsBlocks/blocksTest.php
@@ -46,13 +46,15 @@ require_once 
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 class UserBlocks extends FForge_SeleniumTestCase
 {
        protected $alreadyActive = 0;
+       public $fixture = 'projecta';
 
        function testUserBlocks()
        {
+               $this->loadAndCacheFixture();
+
                $this->_activateBlocksPlugin();
 
-               $this->populateStandardTemplate('empty');
-               $this->init();
+               $this->gotoProject('ProjectA');
 
                $this->click("link=Admin");
                $this->waitForPageToLoad("30000");
diff --git a/tests/func/60_PluginsMoinMoin/moinmoinTest.php 
b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
index eececa2..893fb9d 100644
--- a/tests/func/60_PluginsMoinMoin/moinmoinTest.php
+++ b/tests/func/60_PluginsMoinMoin/moinmoinTest.php
@@ -24,18 +24,20 @@ require_once 
dirname(dirname(__FILE__)).'/Testing/SeleniumForge.php';
 class PluginMoinMoin extends FForge_SeleniumTestCase
 {
        protected $alreadyActive = 0;
+       public $fixture = 'projecta';
 
        function testMoinMoin()
        {
                $this->skip_on_rpm_installs();
                $this->skip_on_centos();
 
+               $this->loadAndCacheFixture();
+
                $this->changeConfig("[moinmoin]\nuse_frame=no\n");
 
                $this->activatePlugin('moinmoin');
 
-               $this->populateStandardTemplate('empty');
-               $this->init();
+               $this->gotoProject('ProjectA');
 
                $this->clickAndWait("link=Admin");
                $this->clickAndWait("link=Tools");
@@ -63,19 +65,6 @@ Is that the Chattanooga choo choo?");
                $this->clickAndWait("link=MoinMoinWiki");
                $this->assertTrue($this->isTextPresent("Chattanooga"));
        }
-
-       /**
-        * Method that is called after Selenium actions.
-        *
-        * @param  string $action
-        */
-       protected function defaultAssertions($action)
-       {
-               if ($action == 'waitForPageToLoad') {
-                       $this->assertTrue($this->isElementPresent("//h1")
-                                         || 
$this->isElementPresent("//div[@id='footer']"));
-               }
-       }
 }
 
 // Local Variables:
diff --git a/tests/func/Testing/SeleniumForge.php 
b/tests/func/Testing/SeleniumForge.php
index 271c248..e072acf 100644
--- a/tests/func/Testing/SeleniumForge.php
+++ b/tests/func/Testing/SeleniumForge.php
@@ -50,24 +50,22 @@ require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
 
 class FForge_SeleniumTestCase extends PHPUnit_Extensions_SeleniumTestCase
 {
-       protected $logged_in = false ;
+       public $logged_in = false ;
+       public $fixture = 'base';
+       public $fixture_loaded = false;
+       
+       public function setUp() {
+               $this->configureSelenium();
+               $this->loadCachedFixture();
+       }
 
-       protected function setUp()
-       {
+       public function configureSelenium() {
                if (getenv('SELENIUM_RC_DIR') && getenv('SELENIUM_RC_URL')) {
                        $this->captureScreenshotOnFailure = true;
                        $this->screenshotPath = getenv('SELENIUM_RC_DIR');
                        $this->screenshotUrl = getenv('SELENIUM_RC_URL');
                }
-               if (defined('DB_INIT_CMD')) {
-                       // Reload a fresh database before running this test 
suite.
-                       $ret = 0;
-                       passthru(DB_INIT_CMD, $ret);
-                       ob_flush();
-                       if ($ret != 0)
-                               die('DB_INIT_CMD ('.DB_INIT_CMD.') failed');
-               }
-
+               
                $this->setBrowser('*firefox');
                $this->setBrowserUrl(URL);
                $this->setHost(SELENIUM_RC_HOST);
@@ -77,7 +75,51 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->screenshotBgColor = '#CCFFDD';
        }
 
-       protected function changeConfig($text) {
+       /**
+        * Load existing fixture.
+        * Mainly used to load the 'base' fixture in tests that don't call 
loadAndCacheFixture() yet
+        */
+       public function loadCachedFixture() {
+               $this->fixture_loaded = false;
+               $base_cmd = dirname(dirname(__FILE__))."/db_reload.sh";
+               $ret = 0;
+               passthru("$base_cmd --exists {$this->fixture}", $ret); 
ob_flush();
+               if ($ret != 0) {
+                       # wait until the test starts (with a valid Selenium 
session) to generate the fixture
+               } else {
+                       passthru("$base_cmd {$this->fixture}", $ret); 
ob_flush();
+                       if ($ret != 0)
+                               die("Error running: $base_cmd 
{$this->fixture}");
+                       $this->fixture_loaded = true;
+               }
+       }
+
+       /**
+        * We can't run the fixture in setUp nor even in assertPreConditions
+        * because the Selenium session isn't started yet >(
+        *
+        * Postponing fixture caching after the test is run.
+        * Call this first in your test.
+        *
+        * Alternatively we could use SQL-based fixtures (rather than
+        * Selenium-based fixtures)
+        */
+       public function loadAndCacheFixture() {
+               if (!$this->fixture_loaded) {
+                       $base_cmd = dirname(dirname(__FILE__))."/db_reload.sh";
+                       $ret = 0;
+                       passthru("$base_cmd base", $ret); ob_flush();
+
+                       
require(dirname(dirname(__FILE__))."/fixtures/{$this->fixture}.php");
+                       call_user_func("fixture_{$this->fixture}", $this);
+                       $this->fixture_loaded = true;
+
+                       passthru("$base_cmd --backup {$this->fixture}", $ret); 
ob_flush();
+               }
+       }
+
+       
+       public function changeConfig($text) {
                $forge_get_config = RUN_JOB_PATH."/forge_get_config";
                $config_path = rtrim(`$forge_get_config config_path`);
                $classname = get_class($this);
@@ -85,7 +127,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                                $text);
        }
 
-       protected function openWithOneRetry($url) {
+       public function openWithOneRetry($url) {
                try {
                        $this->open($url);
                }
@@ -94,27 +136,13 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                }
        }
 
-       /**
-        * Method that is called after Selenium actions.
-        *
-        * @param  string $action
-        */
-       protected function defaultAssertions($action)
-       {
-               if ($action == 'waitForPageToLoad') {
-                       $this->assertElementPresent("//h1");
-//                     
$this->assertFalse($this->isElementPresent("//div[@id='ffErrors']"));
-//                     $this->assertFalse($this->isTextPresent("PhpWiki 
Warning:"));
-               }
-       }
-
-       protected function clickAndWait($link)
+       public function clickAndWait($link)
        {
                $this->click($link);
                $this->waitForPageToLoad();
        }
 
-       protected function waitForTextPresent($text)
+       public function waitForTextPresent($text)
        {
                for ($second = 0; ; $second++) {
                        if ($second >= 30) $this->fail("timeout");
@@ -125,7 +153,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                }
        }
 
-       protected function runCommand($cmd)
+       public function runCommand($cmd)
        {
                system(RUN_COMMAND_PREFIX.$cmd, $ret);
                $this->assertEquals(0, $ret);
@@ -145,17 +173,17 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                ob_flush();
        }
 
-       protected function db($sql)
+       public function db($sql)
        {
                system("echo \"$sql\" | psql -q -Upostgres ".DB_NAME);
        }
 
-       protected function cron($cmd)
+       public function cron($cmd)
        {
                $this->runCommand(RUN_JOB_PATH."/forge_run_job $cmd");
        }
 
-       protected function cron_for_plugin($cmd, $plugin)
+       public function cron_for_plugin($cmd, $plugin)
        {
                $this->runCommand(RUN_JOB_PATH."/forge_run_plugin_job $plugin 
$cmd");
        }
@@ -163,16 +191,16 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
     /**
      * Execute pending system tasks
      */
-       protected function waitSystasks()
+       public function waitSystasks()
        {
                
$this->runCommand(RUN_JOB_PATH.'/systasks_wait_until_empty.php');
        }
 
-       protected function init() {
+       public function init() {
                $this->createAndGoto('ProjectA');
        }
 
-       protected function populateStandardTemplate($what='all')
+       public function populateStandardTemplate($what='all')
        {
                if ($what == 'all') {
                        $what = array('trackers','tasks','forums');
@@ -281,7 +309,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                }
        }
 
-       protected function login($username)
+       public function login($username)
        {
                $this->open( ROOT );
                if ($this->isTextPresent('Log Out')) {
@@ -291,7 +319,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->triggeredLogin($username);
        }
 
-       protected function triggeredLogin($username)
+       public function triggeredLogin($username)
        {
                if ($username == FORGE_ADMIN_USERNAME) {
                        $password = FORGE_ADMIN_PASSWORD;
@@ -306,7 +334,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->logged_in = $username ;
        }
 
-       protected function logout()
+       public function logout()
        {
 //             $this->click("link=Log Out");
                $this->open( ROOT ."/account/logout.php" );
@@ -315,7 +343,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->logged_in = false ;
        }
 
-       protected function switchUser($username)
+       public function switchUser($username)
        {
                if ($this->logged_in != $username) {
                        $this->logout();
@@ -323,17 +351,17 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                }
        }
 
-       protected function isLoginRequired()
+       public function isLoginRequired()
        {
                return $this->isTextPresent("You've been redirected to this 
login page") ;
        }
 
-       protected function isPermissionDenied()
+       public function isPermissionDenied()
        {
                return $this->isTextPresent("Permission denied") ;
        }
 
-       protected function registerProject ($name, $user, $scm='scmsvn') {
+       public function registerProject ($name, $user, $scm='scmsvn') {
                $unix_name = strtolower($name);
 
                $saved_user = $this->logged_in ;
@@ -357,7 +385,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->switchUser ($saved_user) ;
        }
 
-       protected function approveProject ($name, $user) {
+       public function approveProject ($name, $user) {
                $unix_name = strtolower($name);
 
                $saved_user = $this->logged_in ;
@@ -372,23 +400,21 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->switchUser ($saved_user) ;
        }
 
-       protected function createProject ($name, $scm='scmsvn') {
+       public function createProject ($name, $scm='scmsvn') {
                $unix_name = strtolower($name);
 
                $this->switchUser (FORGE_ADMIN_USERNAME) ;
 
                // Create a simple project.
-               if ((!defined('PROJECTA')) || ($unix_name != "projecta")) {
-                       $this->registerProject ($name, FORGE_ADMIN_USERNAME, 
$scm) ;
-               }
+               $this->registerProject($name, FORGE_ADMIN_USERNAME, $scm);
        }
 
-       protected function createAndGoto($project) {
+       public function createAndGoto($project) {
                $this->createProject($project);
                $this->gotoProject($project);
        }
 
-       protected function createUser ($login)
+       public function createUser ($login)
        {
                $this->open( ROOT );
                $this->clickAndWait("link=Site Admin");
@@ -405,16 +431,16 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                
$this->clickAndWait("//table/tbody/tr/td/a[contains(@href,'useredit.php') and 
contains(.,'($login)')]/../..//a[contains(@href, 
'userlist.php?action=activate&user_id=')]");
        }
 
-       protected function activatePlugin($pluginName) {
+       public function activatePlugin($pluginName) {
                $this->switchUser(FORGE_ADMIN_USERNAME);
                $this->open( ROOT . 
'/admin/pluginman.php?update='.$pluginName.'&action=deactivate');
                $this->waitForPageToLoad("30000");
                $this->open( ROOT . 
'/admin/pluginman.php?update='.$pluginName.'&action=activate');
                $this->waitForPageToLoad("30000");
-               $this->logout();
+               //$this->logout();
        }
 
-       protected function gotoProject($project) {
+       public function gotoProject($project) {
                $unix_name = strtolower($project);
 
                $this->open( ROOT . '/projects/' . $unix_name) ;
@@ -422,7 +448,7 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->assertTrue($this->isTextPresent("This is the public 
description for $project."));
        }
 
-       protected function uploadSshKey () {
+       public function uploadSshKey () {
                // Prepare client config
                $sshdir = getenv('HOME') . '/.ssh';
                if (!file_exists($sshdir)) {
@@ -456,36 +482,36 @@ class FForge_SeleniumTestCase extends 
PHPUnit_Extensions_SeleniumTestCase
                $this->clickAndWait("submit");
        }
 
-       protected function skip_test($msg) {
+       public function skip_test($msg) {
                $this->captureScreenshotOnFailure = false;
                $this->markTestSkipped($msg);
        }
 
-       protected function skip_on_rpm_installs($msg='Skipping on installations 
from RPM') {
+       public function skip_on_rpm_installs($msg='Skipping on installations 
from RPM') {
                if (INSTALL_METHOD == 'rpm') {
                        $this->skip_test($msg);
                }
        }
 
-       protected function skip_on_deb_installs($msg='Skipping on installations 
from *.deb') {
+       public function skip_on_deb_installs($msg='Skipping on installations 
from *.deb') {
                if (INSTALL_METHOD == 'deb') {
                        $this->skip_test($msg);
                }
        }
 
-       protected function skip_on_src_installs($msg='Skipping on installations 
from source') {
+       public function skip_on_src_installs($msg='Skipping on installations 
from source') {
                if (INSTALL_METHOD == 'src') {
                        $this->skip_test($msg);
                }
        }
 
-       protected function skip_on_centos($msg='Skipping on CentOS platforms') {
+       public function skip_on_centos($msg='Skipping on CentOS platforms') {
                if (INSTALL_OS == 'centos') {
                        $this->skip_test($msg);
                }
        }
 
-       protected function skip_on_debian($msg='Skipping on Debian platforms') {
+       public function skip_on_debian($msg='Skipping on Debian platforms') {
                if (INSTALL_OS == 'debian') {
                        $this->skip_test($msg);
                }
diff --git a/tests/func/db_reload.sh b/tests/func/db_reload.sh
index d427dba..0324046 100755
--- a/tests/func/db_reload.sh
+++ b/tests/func/db_reload.sh
@@ -1,6 +1,9 @@
-#! /bin/sh
-# Reinitialize contents of the database to pass new tests (using the backup 
made in from /root/dump)
-# define some convenience functions
+#!/bin/bash
+
+# Reinitialize the system to base or fixture'd state (database, SCM
+# repos, plugins data...) to pass new tests
+# TODO: rename me
+
 
 is_db_up () {
     # 'service postgresql status' is not reliable enough
@@ -85,29 +88,37 @@ if [ "$1" = "--backup" ]; then
     backup=1
     shift
 fi
+if [ "$1" = "--exists" ]; then
+    exists=1
+    shift
+fi
 
-# Restore the DB
 if [ $# -eq 1 ]
 then
-       database=$1
+    fixture=$1
 else
-       if type forge_get_config
-       then
-               database=$(forge_get_config database_name)
-       else
-               echo "$0: FATAL ERROR : COULD NOT FIND forge_get_config"
-               exit 1 
-       fi
+    fixture='base'
 fi
-if [ "x$database" = "x" ]
-then
-       echo "Forge database name not found"
+
+
+if [ "$exists" = 1 ]; then
+    pgdir=/var/lib/postgresql
+    if [ -e /etc/redhat-release ]; then pgdir=/var/lib/pgsql; fi
+    if [ -d $pgdir.backup-$fixture ]; then
+       exit 0
+    else
        exit 1
-else
-       echo "Forge database is $database"
+    fi
 fi
 
 
+database=$(forge_get_config database_name)
+if [ "x$database" = "x" ]
+then
+    echo "Forge database name not found"
+    exit 1
+fi
+
 # Reset the DB to a clean post-install state
 if [ "$reset" = 1 ]; then
     set -e
@@ -124,22 +135,20 @@ fi
 # Backup the DB, so that it can be restored for the test suite
 if [ "$backup" = 1 ]; then
     set -e
-    su - postgres -c "pg_dumpall" > /root/dump
     su - postgres -c 'psql -c CHECKPOINT'  # flush to disk
     stop_database
     pgdir=/var/lib/postgresql
     if [ -e /etc/redhat-release ]; then pgdir=/var/lib/pgsql; fi
-    rm -fr $pgdir.backup/*
+    rm -fr $pgdir.backup-$fixture/*
     # support /var/lib/pgsql as a symlink to tmpfs
-    mkdir -p $(readlink -f $pgdir.backup)
-    cp -a --reflink=auto $pgdir/* $pgdir.backup/
+    mkdir -p $(readlink -f $pgdir.backup-$fixture)
+    cp -a --reflink=auto $pgdir/* $pgdir.backup-$fixture/
     start_database
     exit 0
 fi
 
 
 stop_apache
-
 stop_database --force
 
 if [ -d /var/lib/postgresql ] ; then
@@ -171,11 +180,11 @@ rm -rf $(forge_get_config groupdir_prefix) #no trailing 
slash
 #rm -f ~/.ssh/id_rsa ~/.ssh/id_rsa.pub ~/.ssh/known_hosts
 
 # If the backup is there, restore it (it should now have been created by 
run-testsuite.sh)
-if [ -d $dbdir.backup/ ]; then
+if [ -d $dbdir.backup-$fixture/ ]; then
 
-    echo "Restore database from files backup ($dbdir.backup/)"
+    echo "Restore database from files backup ($dbdir.backup-$fixture/)"
     rm -rf $dbdir/*
-    cp -a --reflink=auto $dbdir.backup/* $dbdir/
+    cp -a --reflink=auto $dbdir.backup-$fixture/* $dbdir/
 
     pg_conf=$(ls /etc/postgresql/*/*/postgresql.conf 
/var/lib/pgsql/data/postgresql.conf 2>/dev/null | tail -1)
 
@@ -185,26 +194,8 @@ if [ -d $dbdir.backup/ ]; then
        fi
     done
 else
-    # We will restore from the dump, then perform a backup so that it's there 
next time
-    sleep 3
-    start_database
-
-    # install.sh should have created it, if not, then nothing much we can do
-    if [ -f /root/dump ]
-    then
-        echo "Dropping database $database"
-        su - postgres -c "dropdb -e $database"
-
-       echo "Restore database from dump file: psql -f- < /root/dump"
-       su - postgres -c "psql -f-" < /root/dump > /var/log/pg_restore.log 
2>/var/log/pg_restore.err
-
-        # Perform a file backup which will now be faster to restore, next time 
(align with new install.sh behaviour)
-        $0 --backup
-    else
-       # TODO: reinit the db from scratch and create the dump
-       echo "Couldn't restore the database: No /root/dump found"
-       exit 2
-    fi
+    echo "Couldn't restore the database: $dbdir.backup-$fixture/ not found"
+    exit 2
 fi
 
 start_database
@@ -217,7 +208,6 @@ if [ -x /usr/sbin/nscd ]; then
     echo "Flushing/restarting nscd"
     nscd -i passwd && nscd -i group
 fi
-echo "nscd flushed, going on with tests"
 
 # We may have changed plugins.plugin_id, need to reload the systasksd
 service fusionforge-systasksd restart
diff --git a/tests/func/fixtures/projecta.php b/tests/func/fixtures/projecta.php
new file mode 100644
index 0000000..9953459
--- /dev/null
+++ b/tests/func/fixtures/projecta.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Copyright (C) 2015  Inria (Sylvain Beucler)
+ *
+ * This file is part of FusionForge.
+ *
+ * FusionForge is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation; either version 2 of the License,
+ * or (at your option) any later version.
+ *
+ * FusionForge is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+function fixture_projecta($test) {
+       $test->populateStandardTemplate('all');
+       $test->createProject('ProjectA');
+}
diff --git a/tests/func_tests.php b/tests/func_tests.php
index 3b3b2a9..dbab156 100644
--- a/tests/func_tests.php
+++ b/tests/func_tests.php
@@ -23,7 +23,6 @@ class AllTests
                $suite = new PHPUnit_Framework_TestSuite('PHPUnit');
 
                // Selenium tests
-               if (!defined('DB_INIT_CMD')) { define('PROJECTA','true'); }
                if (getenv('TESTGLOB') != FALSE)
                  $files = glob(getenv('TESTGLOB'));
                else

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

Summary of changes:
 tests/func/50_PluginsScmGit/gitSSHTest.php         |   6 +-
 tests/func/50_PluginsScmGit/gitSmartHTTPTest.php   |   6 +-
 tests/func/50_PluginsScmGit/gitWUITest.php         |   6 +-
 tests/func/60_PluginsBlocks/blocksTest.php         |   6 +-
 tests/func/60_PluginsMoinMoin/moinmoinTest.php     |  19 +--
 tests/func/Testing/SeleniumForge.php               | 148 ++++++++++++---------
 tests/func/db_reload.sh                            |  82 +++++-------
 .../func/fixtures/projecta.php                     |  13 +-
 tests/func_tests.php                               |   1 -
 9 files changed, 148 insertions(+), 139 deletions(-)
 copy src/plugins/taskboard/common/taskboard-init.php => 
tests/func/fixtures/projecta.php (75%)


hooks/post-receive
-- 
FusionForge

_______________________________________________
Fusionforge-commits mailing list
[email protected]
http://lists.fusionforge.org/cgi-bin/mailman/listinfo/fusionforge-commits

Reply via email to