Merge remote-tracking branch 'upstream/master' into social-master

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

diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php
index 6544ee53d75bac92dedb1df223314ea79b2529e3..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';
 
@@ -16,14 +17,29 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
 
     function setUp()
     {
+        $user = User::getKV('nickname', 'userrightstestuser');
+
+        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");
+        }
     }
 
     function tearDown()
     {
-        $profile = $this->user->getProfile();
-        $this->user->delete();
-        $profile->delete();
+        if ($this->user) {
+            $profile = $this->user->getProfile();
+            $this->user->delete();
+            $profile->delete();
+        }
     }
 
     function testInvalidRole()
@@ -33,7 +49,8 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
 
     function standardRoles()
     {
-        return array('admin', 'moderator');
+        return array(array('admin'),
+                     array('moderator'));
     }
 
     /**
@@ -54,6 +71,6 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
     function testGrantedRole($role)
     {
         $this->user->grantRole($role);
-        $this->assertFalse($this->user->hasRole($role));
+        $this->assertTrue($this->user->hasRole($role));
     }
-}
\ No newline at end of file
+}