Changeset 49932

Timestamp:

01/04/2021 11:32:49 PM (6 years ago)

Author:

peterwilsoncc

Message:

Tests: Increase use of shared fixtures in capability checks.

See #51802.

Location:

trunk/tests/phpunit/tests/user

Files:

• author.php (modified) (7 diffs)
• capabilities.php (modified) (6 diffs)

trunk/tests/phpunit/tests/user/author.php

@@ -16 +16 @@
                 self::$author_id = $factory->user->create(
                         array(
-                                'role'        => 'author',
-                                'user_login'  => 'test_author',
-                                'description' => 'test_author',
+                                'role'         => 'author',
+                                'user_login'   => 'test_author',
+                                'display_name' => 'Test Author',
+                                'description'  => 'test_author',
                         )
                 );
@@ -49 +50 @@
 
                 $this->assertSame( $user->display_name, $author_name );
-                $this->assertSame( 'test_author', $author_name );
+                $this->assertSame( 'Test Author', $author_name );
         }
 
@@ -55 +56 @@
                 $this->assertSame( 'test_author', get_the_author_meta( 'login' ) );
                 $this->assertSame( 'test_author', get_the_author_meta( 'user_login' ) );
-                $this->assertSame( 'test_author', get_the_author_meta( 'display_name' ) );
+                $this->assertSame( 'Test Author', get_the_author_meta( 'display_name' ) );
 
                 $this->assertSame( 'test_author', trim( get_the_author_meta( 'description' ) ) );
@@ -111 +112 @@
          */
         public function test_get_the_author_posts_link_no_permalinks() {
-                $author = self::factory()->user->create_and_get(
-                        array(
-                                'display_name'  => 'Foo',
-                                'user_nicename' => 'bar',
-                        )
-                );
+                $author = get_userdata( self::$author_id );
 
                 $GLOBALS['authordata'] = $author->data;
@@ -125 +121 @@
 
                 $this->assertContains( $url, $link );
-                $this->assertContains( 'Posts by Foo', $link );
-                $this->assertContains( '>Foo</a>', $link );
+                $this->assertContains( 'Posts by Test Author', $link );
+                $this->assertContains( '>Test Author</a>', $link );
 
                 unset( $GLOBALS['authordata'] );
@@ -137 +133 @@
                 $this->set_permalink_structure( '/%postname%/' );
 
-                $author = self::factory()->user->create_and_get(
-                        array(
-                                'display_name'  => 'Foo',
-                                'user_nicename' => 'bar',
-                        )
-                );
+                $author = get_userdata( self::$author_id );
 
                 $GLOBALS['authordata'] = $author;
@@ -153 +144 @@
 
                 $this->assertContains( $url, $link );
-                $this->assertContains( 'Posts by Foo', $link );
-                $this->assertContains( '>Foo</a>', $link );
+                $this->assertContains( 'Posts by Test Author', $link );
+                $this->assertContains( '>Test Author</a>', $link );
 
                 unset( $GLOBALS['authordata'] );

trunk/tests/phpunit/tests/user/capabilities.php

@@ -1005 +1005 @@
         function test_user_add_cap() {
                 // There are two contributors.
-                $id_1 = self::factory()->user->create( array( 'role' => 'contributor' ) );
+                $id_1 = self::$users['contributor']->ID;
                 $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );
 
@@ -1044 +1044 @@
         function test_user_remove_cap() {
                 // There are two contributors.
-                $id_1 = self::factory()->user->create( array( 'role' => 'contributor' ) );
+                $id_1 = self::$users['contributor']->ID;
                 $id_2 = self::factory()->user->create( array( 'role' => 'contributor' ) );
 
@@ -1076 +1076 @@
         function test_user_level_update() {
                 // User starts as an author.
-                $id   = self::factory()->user->create( array( 'role' => 'author' ) );
+                $id   = self::$users['author']->ID;
                 $user = new WP_User( $id );
                 $this->assertTrue( $user->exists(), "Problem getting user $id" );
@@ -1099 +1099 @@
         function test_user_remove_all_caps() {
                 // User starts as an author.
-                $id   = self::factory()->user->create( array( 'role' => 'author' ) );
+                $id   = self::$users['author']->ID;
                 $user = new WP_User( $id );
                 $this->assertTrue( $user->exists(), "Problem getting user $id" );
@@ -1154 +1154 @@
 
                 // Add some other users.
-                $admin       = new WP_User( self::factory()->user->create( array( 'role' => 'administrator' ) ) );
+                $admin       = self::$users['administrator'];
                 $author_2    = new WP_User( self::factory()->user->create( array( 'role' => 'author' ) ) );
-                $editor      = new WP_User( self::factory()->user->create( array( 'role' => 'editor' ) ) );
-                $contributor = new WP_User( self::factory()->user->create( array( 'role' => 'contributor' ) ) );
+                $editor      = self::$users['editor'];
+                $contributor = self::$users['contributor'];
 
                 // Administrators, editors and the post owner can edit it.
@@ -1901 +1901 @@
          */
         function test_wp_logout_should_clear_current_user() {
-                $user_id = self::factory()->user->create();
+                $user_id = self::$users['author']->ID;
                 wp_set_current_user( $user_id );