From: Brion Vibber <brion@pobox.com>
Date: Tue, 15 Dec 2009 22:49:53 +0000 (-0800)
Subject: Fix UserRightsTest unit tests
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=a998bda4a57014d0a319fd0bc31552705f0887ed;p=quix0rs-gnu-social.git

Fix UserRightsTest unit tests
---

diff --git a/classes/User.php b/classes/User.php
index d04f7d679f..c62314d500 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -329,7 +329,7 @@ class User extends Memcached_DataObject
 
         $profile->query('COMMIT');
 
-        if ($email && !$user->email) {
+        if (!empty($email) && !$user->email) {
             mail_confirm_address($user, $confirm->code, $profile->nickname, $email);
         }
 
diff --git a/tests/UserRightsTest.php b/tests/UserRightsTest.php
index 6544ee53d7..d24a172f6f 100644
--- a/tests/UserRightsTest.php
+++ b/tests/UserRightsTest.php
@@ -16,14 +16,26 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
 
     function setUp()
     {
+        $user = User::staticGet('nickname', 'userrightstestuser');
+        if ($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 +45,8 @@ class UserRightsTest extends PHPUnit_Framework_TestCase
 
     function standardRoles()
     {
-        return array('admin', 'moderator');
+        return array(array('admin'),
+                     array('moderator'));
     }
 
     /**
@@ -54,6 +67,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