Changeset 9561 for trunk/tests/phpunit/testcases/activity/template.php

Timestamp:

02/27/2015 03:00:42 AM (10 years ago)

Author:

boonebgorges

Message:

Don't create a current user by default in most unit tests.

The default state of our tests should be as a logged-out user. BP does pretty
different things with different kinds of logged-in users, so individual tests
should decide for themselves what the current user status should be.

Moreover, the creation of fixture users is fairly resource-intensive. Not
creating users when they're not needed makes the test suite run 5-10% faster.

See #6009.

File:

• trunk/tests/phpunit/testcases/activity/template.php (modified) (10 diffs)

trunk/tests/phpunit/testcases/activity/template.php

@@ -4 +4 @@
  */
 class BP_Tests_Activity_Template extends BP_UnitTestCase {
-    protected $old_current_user = 0;
-
-    public function setUp() {
-        parent::setUp();
-
-        $this->old_current_user = get_current_user_id();
-        $this->set_current_user( $this->factory->user->create( array( 'role' => 'subscriber' ) ) );
-    }
-
-    public function tearDown() {
-        parent::tearDown();
-        $this->set_current_user( $this->old_current_user );
-    }
 
     /**
@@ -23 +10 @@
     public function test_user_can_delete() {
         $bp = buddypress();
+        $u = $this->factory->user->create();
+        $original_user = bp_loggedin_user_id();
+        $this->set_current_user( $u );
 
         $a = $this->factory->activity->create( array(
             'type' => 'activity_update',
+            'user_id' => $u,
         ) );
 
@@ -31 +22 @@
         $activity = $this->factory->activity->get_object_by_id( $a );
         $this->assertTrue( bp_activity_user_can_delete( $activity ) );
-
-        // Stash original user
-        $original_user = get_current_user_id();
 
         // Logged-out user can't delete
@@ -107 +95 @@
         ) );
 
+        $current_user = bp_loggedin_user_id();
+        $this->set_current_user( $user_id );
+
         bp_activity_add_user_favorite( $a1, $user_id );
         bp_activity_add_user_favorite( $a2, $user_id );
+
+        $this->set_current_user( $current_user );
 
         // groan. It sucks that you have to invoke the global
@@ -1224 +1217 @@
         add_filter( 'bp_disable_blogforum_comments', '__return_false' );
 
+        $u = $this->factory->user->create();
+
         $now = time();
         $a1 = $this->factory->activity->create( array(
@@ -1230 +1225 @@
             'type' => 'new_blog_post',
             'recorded_time' => date( 'Y-m-d H:i:s', $now ),
+            'user_id' => $u,
         ) );
         $a2 = $this->factory->activity->create( array(
@@ -1236 +1232 @@
             'type' => 'new_blog_comment',
             'recorded_time' => date( 'Y-m-d H:i:s', $now - 100 ),
+            'user_id' => $u,
         ) );
 
@@ -1244 +1241 @@
             'content' => 'Candy is good',
             'recorded_time' => date( 'Y-m-d H:i:s', $now - 200 ),
+            'user_id' => $u,
         ) );
 
@@ -1251 +1249 @@
             'type' => 'activity_update',
             'recorded_time' => date( 'Y-m-d H:i:s', $now - 300 ),
+            'user_id' => $u,
         ) );
 
@@ -1259 +1258 @@
             'content' => 'Candy is great',
             'recorded_time' => date( 'Y-m-d H:i:s', $now - 400 ),
+            'user_id' => $u,
         ) );
         global $activities_template;