Merged

[quix0rs-gnu-social.git] / tests / UserRightsTest.php

diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php
index 97bf195749d703bde75570f919283f3c13d33730..031be0cc4403919b92f225a41c222f6e5344860a 100644 (file)
--- a/tests/UserRightsTest.php
+++ b/tests/UserRightsTest.php
@@ -6,7 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 
@@ -17,13 +18,16 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
     function setUp()
     {
         $user = User::getKV('nickname', 'userrightstestuser');
-        if ($user) {
+
+        if ($user instanceof User) {
             // Leftover from a broken test run?
             $profile = $user->getProfile();
             $user->delete();
             $profile->delete();
         }
+
         $this->user = User::register(array('nickname' => 'userrightstestuser'));
+
         if (!$this->user) {
             throw new Exception("Couldn't register userrightstestuser");
         }
@@ -69,4 +73,4 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
         $this->user->grantRole($role);
         $this->assertTrue($this->user->hasRole($role));
     }
-}
\ No newline at end of file
+}