Ticket #41787: 41787.diff

src/wp-includes/js/media-audiovideo.js

@@ -61 +61 @@
                 }
 
                 if ( ! t.isDynamic ) {
-                        t.$node.remove();
+                        t.node.remove();
                 }
 
-                if ( 'native' !== t.media.pluginType ) {
-                        t.$media.remove();
+                if ( 'html5' !== t.media.rendererName ) {
+                        t.media.remove();
                 }
 
                 delete window.mejs.players[t.id];
 
                 t.container.remove();
-                t.globalUnbind();
-                delete t.node.player;
+                t.globalUnbind('resize', t.globalResizeCallback);
+                t.globalUnbind('keydown', t.globalKeydownCallback);
+                t.globalUnbind('click', t.globalClickCallback);
+                delete t.media.player;
         },
 
         /**

tests/phpunit/tests/user/countUsers.php

@@ -157 +157 @@
                 ), $count['avail_roles'] );
         }
 
+        /**
+         * @ticket 42014
+         * @group multisite
+         * @group ms-required
+         *
+         * @dataProvider data_count_users_strategies
+         */
+        public function test_count_users_multisite_queries_correct_roles( $strategy ) {
+                $site_id = (int) self::factory()->blog->create();
+
+                switch_to_blog( $site_id );
+                wp_roles()->add_role( 'tester', 'Tester', array( 'test' => true ) );
+                $user_id = self::factory()->user->create( array(
+                        'role' => 'tester',
+                ) );
+                restore_current_blog();
+
+                $count = count_users( $strategy, $site_id );
+                $this->assertEqualSetsWithIndex( array(
+                        'tester' => 1,
+                        'none'   => 0,
+                ), $count['avail_roles'] );
+        }
+
         /**
          * @ticket 34495
          *

tests/phpunit/tests/user/wpGetUsersWithNoRole.php

@@ -121 +121 @@
                 $this->assertEmpty( $users );
         }
 
+        /**
+         * @ticket 42015
+         * @group multisite
+         * @group ms-required
+         */
+        public function test_get_users_with_no_role_matches_on_role_name_different_site() {
+                $site_id = (int) self::factory()->blog->create();
+
+                switch_to_blog( $site_id );
+                wp_roles()->add_role( 'somerole', 'Some role display name' );
+                $user_id = self::factory()->user->create( array(
+                        'role' => 'somerole',
+                ) );
+                restore_current_blog();
+
+                $users = wp_get_users_with_no_role( $site_id );
+
+                $this->assertEmpty( $users );
+        }
+
 }

tests/qunit/wp-includes/js/wp-api.js

@@ -421 +421 @@
         } );
 
 
+        // Test that models have the correct requireForceForDelete setting.
+        var modelsThatNeedrequireForceForDelete = [
+                { name: 'Category', expect: true },
+                { name: 'Comment', expect: undefined },
+                { name: 'Media', expect: undefined },
+                { name: 'Page', expect: undefined },
+                { name: 'PageRevision', expect: true },
+                { name: 'Post', expect: undefined },
+                { name: 'PostRevision', expect: true },
+                { name: 'Status', expect: undefined },
+                { name: 'Tag', expect: true },
+                { name: 'Taxonomy', expect: undefined },
+                { name: 'Type', expect: undefined },
+                { name: 'User', expect: true }
+        ];
+
+        _.each( modelsThatNeedrequireForceForDelete, function( model ) {
+                QUnit.test( 'Test requireForceForDelete is correct for ' + model.name, function( assert ) {
+                        var done = assert.async();
+                        assert.expect( 1 );
+                        wp.api.loadPromise.done( function() {
+
+                                // Instantiate the model.
+                                var theModel = new wp.api.models[ model.name ]();
+
+                                // Verify the model's requireForceForDelete is set as expected.
+                                assert.equal(
+                                        theModel.requireForceForDelete,
+                                        model.expect,
+                                        'wp.api.models.' + model.name + '.requireForceForDelete should be ' + model.expect + '.'
+                                );
+
+                                // Trigger Qunit async completion.
+                                done();
+                        } );
+                } );
+        } );
+
 } )( window.QUnit );