Changes from trunk/tests/phpunit/tests/user.php at r33115 to branches/4.3/tests/phpunit/tests/user.php at r34118

File:

• branches/4.3/tests/phpunit/tests/user.php (modified) (4 diffs)

branches/4.3/tests/phpunit/tests/user.php

@@ -336 +336 @@
 
     /**
-     * Test that usermeta cache is cleared after user deletion.
-     *
-     * @ticket 19500
-     */
-    function test_get_blogs_of_user() {
-        // Logged out users don't have blogs.
-        $this->assertEquals( array(), get_blogs_of_user( 0 ) );
-
-        $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
-        $blogs = get_blogs_of_user( $user_id );
-        $this->assertEquals( array( 1 ), array_keys( $blogs ) );
-
-        // Non-existent users don't have blogs.
-        if ( is_multisite() )
-            wpmu_delete_user( $user_id );
-        else
-            wp_delete_user( $user_id );
-
-        $user = new WP_User( $user_id );
-        $this->assertFalse( $user->exists(), 'WP_User->exists' );
-        $this->assertEquals( array(), get_blogs_of_user( $user_id ) );
-    }
-
-    /**
-     * Test that usermeta cache is cleared after user deletion.
-     *
-     * @ticket 19500
-     */
-    function test_is_user_member_of_blog() {
-        $old_current = get_current_user_id();
-
-        $user_id = $this->factory->user->create( array( 'role' => 'subscriber' ) );
-        wp_set_current_user( $user_id );
-
-        $this->assertTrue( is_user_member_of_blog() );
-        $this->assertTrue( is_user_member_of_blog( 0, 0 ) );
-        $this->assertTrue( is_user_member_of_blog( 0, get_current_blog_id() ) );
-        $this->assertTrue( is_user_member_of_blog( $user_id ) );
-        $this->assertTrue( is_user_member_of_blog( $user_id, get_current_blog_id() ) );
-
-        // Will only remove the user from the current site in multisite; this is desired
-        // and will achieve the desired effect with is_user_member_of_blog().
-        wp_delete_user( $user_id );
-
-        $this->assertFalse( is_user_member_of_blog( $user_id ) );
-        $this->assertFalse( is_user_member_of_blog( $user_id, get_current_blog_id() ) );
-
-        wp_set_current_user( $old_current );
-    }
-
-    /**
      * ticket 19595
      */
@@ -457 +406 @@
     }
 
-    function test_delete_user() {
-        $user_id = $this->factory->user->create( array( 'role' => 'author' ) );
-        $user = new WP_User( $user_id );
-
-        $post = array(
-            'post_author' => $user_id,
-            'post_status' => 'publish',
-            'post_content' => rand_str(),
-            'post_title' => rand_str(),
-            'post_type' => 'post',
-        );
-
-        // insert a post and make sure the ID is ok
-        $post_id = wp_insert_post($post);
-        $this->assertTrue(is_numeric($post_id));
-        $this->assertTrue($post_id > 0);
-
-        $post = get_post( $post_id );
-        $this->assertEquals( $post_id, $post->ID );
-
-        $post = array(
-            'post_author' => $user_id,
-            'post_status' => 'publish',
-            'post_content' => rand_str(),
-            'post_title' => rand_str(),
-            'post_type' => 'nav_menu_item',
-        );
-
-        // insert a post and make sure the ID is ok
-        $nav_id = wp_insert_post($post);
-        $this->assertTrue(is_numeric($nav_id));
-        $this->assertTrue($nav_id > 0);
-
-        $post = get_post( $nav_id );
-        $this->assertEquals( $nav_id, $post->ID );
-
-        wp_delete_user( $user_id );
-        $user = new WP_User( $user_id );
-        if ( is_multisite() )
-            $this->assertTrue( $user->exists() );
-        else
-            $this->assertFalse( $user->exists() );
-
-        $this->assertNotNull( get_post( $post_id ) );
-        $this->assertEquals( 'trash', get_post( $post_id )->post_status );
-        // nav_menu_item is delete_with_user = false so the nav post should remain published.
-        $this->assertNotNull( get_post( $nav_id ) );
-        $this->assertEquals( 'publish', get_post( $nav_id )->post_status );
-        wp_delete_post( $nav_id, true );
-        $this->assertNull( get_post( $nav_id ) );
-        wp_delete_post( $post_id, true );
-        $this->assertNull( get_post( $post_id ) );
-    }
-
     /**
      * @ticket 13317
@@ -549 +444 @@
         $user = WP_User::get_data_by( 'id', 99999 );
         $this->assertEquals( false, $user );
-    }
-
-    /**
-     * @ticket 20447
-     */
-    function test_wp_delete_user_reassignment_clears_post_caches() {
-        $user_id   = $this->factory->user->create();
-        $reassign  = $this->factory->user->create();
-        $post_id   = $this->factory->post->create( array( 'post_author' => $user_id ) );
-
-        get_post( $post_id ); // Ensure this post is in the cache.
-
-        wp_delete_user( $user_id, $reassign );
-
-        $post = get_post( $post_id );
-        $this->assertEquals( $reassign, $post->post_author );
     }
 
@@ -801 +680 @@
     }
 
+    /**
+     * Testing wp_new_user_notification email statuses.
+     *
+     * @dataProvider data_wp_new_user_notifications
+     * @ticket 33654
+     */
+    function test_wp_new_user_notification( $notify, $admin_email_sent_expected, $user_email_sent_expected ) {
+        unset( $GLOBALS['phpmailer']->mock_sent );
+
+        $was_admin_email_sent = false;
+        $was_user_email_sent = false;
+
+        $user = $this->factory->user->create( $this->user_data );
+
+        wp_new_user_notification( $user, null, $notify );
+
+        /*
+         * Check to see if a notification email was sent to the
+         * post author `blackburn@battlefield3.com` and and site admin `admin@example.org`.
+         */
+        if ( ! empty( $GLOBALS['phpmailer']->mock_sent ) ) {
+            $was_admin_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[0] ) && WP_TESTS_EMAIL == $GLOBALS['phpmailer']->mock_sent[0]['to'][0][0] );
+            $was_user_email_sent = ( isset( $GLOBALS['phpmailer']->mock_sent[1] ) && 'blackburn@battlefield3.com' == $GLOBALS['phpmailer']->mock_sent[1]['to'][0][0] );
+        }
+
+        $this->assertSame( $admin_email_sent_expected, $was_admin_email_sent, 'Admin email result was not as expected in test_wp_new_user_notification' );
+        $this->assertSame( $user_email_sent_expected , $was_user_email_sent, 'User email result was not as expected in test_wp_new_user_notification' );
+    }
+
+    /**
+     * Data provider for test_wp_new_user_notification().
+     *
+     * Passes the three available options for the $notify parameter and the expected email
+     * emails sent status as a bool.
+     *
+     * @return array {
+     *     @type array {
+     *         @type string $post_args               The arguments that will merged with the $_POST array.
+     *         @type bool $admin_email_sent_expected The expected result of whether an email was sent to the admin.
+     *         @type bool $user_email_sent_expected  The expected result of whether an email was sent to the user.
+     *     }
+     * }
+     */
+    function data_wp_new_user_notifications() {
+        return array(
+            array(
+                '',
+                true,
+                false,
+            ),
+            array(
+                'admin',
+                true,
+                false,
+            ),
+            array(
+                'both',
+                true,
+                true,
+            ),
+        );
+    }
+
+    /**
+     * Set up a user and try sending a notification using the old, deprecated
+     * function signature `wp_new_user_notification( $user, 'plaintext_password' );`.
+     *
+     * @ticket 33654
+     * @expectedDeprecated wp_new_user_notification
+     */
+    function test_wp_new_user_notification_old_signature_throws_deprecated_warning() {
+        $user = $this->factory->user->create(
+            array(
+                'role'       => 'author',
+                'user_login' => 'test_wp_new_user_notification',
+                'user_pass'  => 'password',
+                'user_email' => 'test@test.com',
+            )
+        );
+
+        wp_new_user_notification( $user, 'this_is_deprecated' );
+    }
 }