Merge branch 'master' into privatekey2

3 files changed, 31 insertions, 13 deletions

diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php
index 2caa701..20574f3 100644
--- a/tests/TestBaseApi.php
+++ b/tests/TestBaseApi.php
@@ -50,8 +50,9 @@ class TestBaseApi extends TestBase
         $this->url = $GLOBALS['unittestUrl'] . $this->urlPart;
 
         //clean up before test
-        if (file_exists($GLOBALS['datadir'] . '/config.unittest.php')) {
-            unlink($GLOBALS['datadir'] . '/config.unittest.php');
+        $configFile = $GLOBALS['datadir'] . '/config.testing-tmp.php';
+        if (file_exists($configFile)) {
+            unlink($configFile);
         }
 
         $this->us = SemanticScuttle_Service_Factory::get('User');
@@ -71,19 +72,36 @@ class TestBaseApi extends TestBase
      * @param string $urlSuffix Suffix for the URL
      *
      * @return HTTP_Request2 HTTP request object
-     *
-     * @uses $url
      */
     protected function getRequest($urlSuffix = null)
     {
-        $req = new HTTP_Request2(
-            $this->url . $urlSuffix,
-            HTTP_Request2::METHOD_GET
-        );
+        $url = $this->getTestUrl($urlSuffix);
+        $req = new HTTP_Request2($url, HTTP_Request2::METHOD_GET);
 
         return $req;
     }
 
+    /**
+     * Creates an URL from $this->url plus $urlSuffix and an appended
+     * unittestMode=1 parameter.
+     *
+     * @param string $urlSuffix Suffix for the URL
+     *
+     * @return string URL
+     *
+     * @uses $url
+     */
+    protected function getTestUrl($urlSuffix = null)
+    {
+        $url = $this->url . $urlSuffix;
+        if (strpos($urlSuffix, '?') !== false) {
+            $url .= '&unittestMode=1';
+        } else {
+            $url .= '?unittestMode=1';
+        }
+        return $url;
+    }
+
 
     /**
      * Completes an URL that's missing the protocol.
@@ -165,7 +183,7 @@ class TestBaseApi extends TestBase
         $uid = $this->addUser($username, $password);
 
         $req = new HTTP_Request2(
-            $GLOBALS['unittestUrl'] . '/login.php',
+            $GLOBALS['unittestUrl'] . '/login.php?unittestMode=1',
             HTTP_Request2::METHOD_POST
         );
         $cookies = $req->setCookieJar()->getCookieJar();
@@ -230,7 +248,7 @@ class TestBaseApi extends TestBase
 
         $this->assertInternalType(
             'integer',
-            file_put_contents($GLOBALS['datadir'] . '/config.unittest.php', $str),
+            file_put_contents($GLOBALS['datadir'] . '/config.testing-tmp.php', $str),
             'Writing config.unittest.php failed'
         );
     }
diff --git a/tests/prepare.php b/tests/prepare.php
index c80306e..ea4d77d 100644
--- a/tests/prepare.php
+++ b/tests/prepare.php
@@ -22,7 +22,7 @@ $_SERVER['HTTP_HOST'] = 'http://localhost/';
 define('UNIT_TEST_MODE', true);
 
 if ('@data_dir@' == '@' . 'data_dir@') {
-    //non pear-install
+    //non pear-installation (i.e. git checkout)
     require_once dirname(__FILE__) . '/../src/SemanticScuttle/header.php';
 } else {
     //pear installation; files are in include path
@@ -35,7 +35,7 @@ if ($GLOBALS['debugMode'] == true
     && $GLOBALS['dbtype'] == 'mysql4'
 ) {
     echo "\n"
-        . '!!! The combination of debugMode and dbtype==mysql4'
+        . '!! The combination of debugMode and dbtype==mysql4'
         . ' will wreck some tests' . "\n\n";
 }
 ?>
\ No newline at end of file
diff --git a/tests/www/searchTest.php b/tests/www/searchTest.php
index 1220667..5dce69d 100644
--- a/tests/www/searchTest.php
+++ b/tests/www/searchTest.php
@@ -41,7 +41,7 @@ class www_SearchTest extends TestBaseApi
             'No bookmark found', false
         );
 
-        $res = $this->getRequest('/all/baz bat')->send();
+        $res = $this->getRequest('/all/baz%20bat')->send();
         $this->assertSelectCount(
             '.xfolkentry', false, $res->getBody(),
             'Bookmarks found', false