Merge branch 'feature/ISTWCMS-4820-ebremner-missing-headers' into '3.0.x'

ISTWCMS-4820: adding patched version of diff to fix missing headers

See merge request !241

composer.json

@@ -31,7 +31,7 @@
         "drupal/ctools": "3.7",
         "drupal/dashboards": "dev-2.0.0-beta12-uw_wcms1",
         "drupal/draggableviews": "2.0.1",
-        "drupal/diff": "1.0",
+        "drupal/diff": "dev-1.0-uw_wcms1",
         "drupal/entity_browser": "2.6",
         "drupal/entity_browser_block": "1.1",
         "drupal/entity_browser_block_layout": "1.0.0-beta1",

tests/src/Functional/UwWcmsBasicTest.php

@@ -79,6 +79,7 @@ class UwWcmsBasicTest extends BrowserTestBase {
     $this->layoutSectionConfigurationFormTest();
     $this->webformTests();
     $this->createContent();
+    $this->diffHeaders();
     $this->taxonomies();
     $this->catalogTest();
     $this->schemaTest();
@@ -753,6 +754,49 @@ class UwWcmsBasicTest extends BrowserTestBase {
     $this->assertSession()->statusCodeEquals(403);
   }
 
+  /**
+   * Tests for diff headers.
+   */
+  private function diffHeaders() {
+
+    // Login to site.
+    $this->drupalLogin($this->drupalUsers['uw_role_site_manager']);
+
+    // Go to add node of web page.
+    $this->drupalGet('node/add/uw_ct_web_page');
+    $this->assertSession()->statusCodeEquals(200);
+
+    // Fields to fill in for web page.
+    $edit = [
+      'edit-title-0-value' => $this->randomString(),
+      'edit-field-uw-meta-description-0-value' => $this->randomString(),
+      'edit-moderation-state-0-state' => 'published',
+    ];
+
+    // Submit the add node form.
+    $this->submitForm($edit, 'Save');
+
+    // Click on the edit link to change a value of the node.
+    $this->clickLink('Edit');
+
+    // Change the values.
+    $edit = [
+      'edit-title-0-value' => $this->randomString(),
+      'edit-field-uw-meta-description-0-value' => $this->randomString(),
+      'edit-moderation-state-0-state' => 'published',
+    ];
+
+    // Submit to node edit form.
+    $this->submitForm($edit, 'Save');
+
+    // Click on the Revisions link.
+    $this->clickLink('Revisions');
+
+    // Ensure that the SELECT REVISION headers are on the page.
+    $this->assertSession()->pageTextContains('SELECT REVISION A');
+    $this->assertSession()->pageTextContains('SELECT REVISION B');
+  }
+
   /**
    * Test taxonomies.
    */