.../src/Functional/BlockContentCacheTagsTest.php | 14 -------------- .../tests/src/Functional/BlockContentCreationTest.php | 5 ++--- .../tests/src/Functional/BlockContentPageViewTest.php | 10 +--------- .../src/Functional/BlockContentTranslationUITest.php | 10 +--------- .../quickedit/src/Tests/QuickEditLoadingTest.php | 2 +- .../BlockContent/BlockContentResourceTestBase.php | 19 +++++++++---------- .../Update/UpdatePathRC1TestBaseFilledTest.php | 14 -------------- 7 files changed, 14 insertions(+), 60 deletions(-) diff --git a/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php b/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php index bf4eb00..59f111b 100644 --- a/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentCacheTagsTest.php @@ -8,7 +8,6 @@ use Drupal\Core\Entity\EntityInterface; use Drupal\Core\Language\LanguageInterface; use Drupal\system\Tests\Entity\EntityCacheTagsTestBase; -use Drupal\user\Entity\Role; use Symfony\Component\HttpFoundation\Request; /** @@ -26,19 +25,6 @@ class BlockContentCacheTagsTest extends EntityCacheTagsTestBase { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); - - // Give anonymous users permission to access content, so that we can view - // BlockContent entity. - $anonymous_role = Role::load(Role::ANONYMOUS_ID); - $anonymous_role->grantPermission('access content'); - $anonymous_role->save(); - } - - /** - * {@inheritdoc} - */ protected function createEntity() { $block_content_type = BlockContentType::create([ 'id' => 'basic', diff --git a/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php index e9001c3..562a4bd 100644 --- a/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentCreationTest.php @@ -21,7 +21,7 @@ class BlockContentCreationTest extends BlockContentTestBase { * * @var array */ - public static $modules = ['block_content_test', 'dblog', 'field_ui', 'node']; + public static $modules = ['block_content_test', 'dblog', 'field_ui']; /** * Permissions to grant admin user. @@ -30,8 +30,7 @@ class BlockContentCreationTest extends BlockContentTestBase { */ protected $permissions = [ 'administer blocks', - 'administer block_content display', - 'access content', + 'administer block_content display' ]; /** diff --git a/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php b/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php index b9494d7..355faf1 100644 --- a/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentPageViewTest.php @@ -14,15 +14,7 @@ class BlockContentPageViewTest extends BlockContentTestBase { * * @var array */ - public static $modules = ['block_content_test', 'node']; - - /** - * {@inheritdoc} - */ - protected $permissions = [ - 'administer blocks', - 'access content', - ]; + public static $modules = ['block_content_test']; /** * Checks block edit and fallback functionality. diff --git a/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php b/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php index 41c9465..2699fcf 100644 --- a/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php +++ b/core/modules/block_content/tests/src/Functional/BlockContentTranslationUITest.php @@ -6,7 +6,6 @@ use Drupal\block_content\Entity\BlockContentType; use Drupal\Component\Utility\Unicode; use Drupal\content_translation\Tests\ContentTranslationUITestBase; -use Drupal\user\Entity\Role; /** * Tests the block content translation UI. @@ -25,8 +24,7 @@ class BlockContentTranslationUITest extends ContentTranslationUITestBase { 'content_translation', 'block', 'field_ui', - 'block_content', - 'node', + 'block_content' ]; /** @@ -52,12 +50,6 @@ protected function setUp() { parent::setUp(); $this->drupalPlaceBlock('page_title_block'); - - // Give anonymous users permission to access content, so that we can view - // BlockContent entity. - $anonymous_role = Role::load(Role::ANONYMOUS_ID); - $anonymous_role->grantPermission('access content'); - $anonymous_role->save(); } /** diff --git a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php index b644740..150ef00 100644 --- a/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php +++ b/core/modules/quickedit/src/Tests/QuickEditLoadingTest.php @@ -96,7 +96,7 @@ protected function setUp() { // editing $basic_permissions = ['access content', 'create article content', 'edit any article content', 'use text format filtered_html', 'access contextual links']; $this->authorUser = $this->drupalCreateUser($basic_permissions); - $this->editorUser = $this->drupalCreateUser(array_merge($basic_permissions, ['access in-place editing', 'access content'])); + $this->editorUser = $this->drupalCreateUser(array_merge($basic_permissions, ['access in-place editing'])); } /** diff --git a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php index 42d1ea2..8b67cc6 100644 --- a/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php +++ b/core/modules/rest/tests/src/Functional/EntityResource/BlockContent/BlockContentResourceTestBase.php @@ -40,7 +40,7 @@ * {@inheritdoc} */ protected function setUpAuthorization($method) { - $this->grantPermissionsToTestedRole(['administer blocks', 'access content']); + $this->grantPermissionsToTestedRole(['administer blocks']); } /** @@ -65,7 +65,8 @@ protected function createEntity() { 'value' => 'The name "llama" was adopted by European settlers from native Peruvians.', 'format' => 'plain_text', ], - ]); + ]) + ->setPublished(FALSE); $block_content->save(); return $block_content; } @@ -132,6 +133,11 @@ protected function getExpectedNormalizedEntity() { 'summary' => NULL, ], ], + 'status' => [ + [ + 'value' => FALSE, + ], + ], ]; } @@ -162,14 +168,7 @@ protected function getExpectedUnauthorizedAccessMessage($method) { return parent::getExpectedUnauthorizedAccessMessage($method); } - switch ($method) { - case 'GET': - case 'PATCH': - return "The 'access content' permission is required for view, and 'administer blocks' permission is required for update BlockContent entity."; - - default: - return parent::getExpectedUnauthorizedAccessMessage($method); - } + return parent::getExpectedUnauthorizedAccessMessage($method); } } diff --git a/core/modules/system/tests/src/Functional/Update/UpdatePathRC1TestBaseFilledTest.php b/core/modules/system/tests/src/Functional/Update/UpdatePathRC1TestBaseFilledTest.php index 1d4eedc..7573fc4 100644 --- a/core/modules/system/tests/src/Functional/Update/UpdatePathRC1TestBaseFilledTest.php +++ b/core/modules/system/tests/src/Functional/Update/UpdatePathRC1TestBaseFilledTest.php @@ -4,7 +4,6 @@ use Drupal\node\Entity\Node; use Drupal\node\Entity\NodeType; -use Drupal\user\Entity\Role; use Drupal\user\Entity\User; /** @@ -17,19 +16,6 @@ class UpdatePathRC1TestBaseFilledTest extends UpdatePathRC1TestBaseTest { /** * {@inheritdoc} */ - protected function setUp() { - parent::setUp(); - - // Give anonymous users permission to access content, so that we can view - // BlockContent entity. - $anonymous_role = Role::load(Role::ANONYMOUS_ID); - $anonymous_role->grantPermission('access content'); - $anonymous_role->save(); - } - - /** - * {@inheritdoc} - */ protected function setDatabaseDumpFiles() { parent::setDatabaseDumpFiles(); $this->databaseDumpFiles[0] = __DIR__ . '/../../../../tests/fixtures/update/drupal-8-rc1.filled.standard.php.gz';