Updated to Drupal 8.6.4, which is PHP 7.3 friendly. Also updated HTMLaw library....

[yaffs-website] / web / core / modules / content_moderation / tests / src / Functional / ModerationStateAccessTest.php

diff --git a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php
index 7d2f74666e50042057cfc4e0e45e3e195eb96d03..86269193e3f67dcfd99b289512ed72c8efd9fe1e 100644 (file)
--- a/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php
+++ b/web/core/modules/content_moderation/tests/src/Functional/ModerationStateAccessTest.php
@@ -5,7 +5,7 @@ namespace Drupal\Tests\content_moderation\Functional;
 use Drupal\node\Entity\Node;
 use Drupal\node\Entity\NodeType;
 use Drupal\Tests\BrowserTestBase;
-use Drupal\workflows\Entity\Workflow;
+use Drupal\Tests\content_moderation\Traits\ContentModerationTestTrait;
 
 /**
  * Tests the view access control handler for moderation state entities.
@@ -14,6 +14,8 @@ use Drupal\workflows\Entity\Workflow;
  */
 class ModerationStateAccessTest extends BrowserTestBase {
 
+  use ContentModerationTestTrait;
+
   /**
    * {@inheritdoc}
    */
@@ -32,7 +34,6 @@ class ModerationStateAccessTest extends BrowserTestBase {
     $permissions = [
       'access content',
       'view all revisions',
-      'view content moderation',
     ];
     $editor1 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($editor1);
@@ -69,7 +70,6 @@ class ModerationStateAccessTest extends BrowserTestBase {
     $permissions = [
       'access content',
       'view all revisions',
-      'administer content moderation',
     ];
     $admin1 = $this->drupalCreateUser($permissions);
     $this->drupalLogin($admin1);
@@ -90,18 +90,18 @@ class ModerationStateAccessTest extends BrowserTestBase {
    * @param string $machine_name
    *   The machine name of the type to create.
    *
-   * @return NodeType
+   * @return \Drupal\node\Entity\NodeType
    *   The node type just created.
    */
   protected function createNodeType($label, $machine_name) {
-    /** @var NodeType $node_type */
+    /** @var \Drupal\node\Entity\NodeType $node_type */
     $node_type = NodeType::create([
       'type' => $machine_name,
       'label' => $label,
     ]);
     $node_type->save();
 
-    $workflow = Workflow::load('editorial');
+    $workflow = $this->createEditorialWorkflow();
     $workflow->getTypePlugin()->addEntityTypeAndBundle('node', $machine_name);
     $workflow->save();
     return $node_type;