Updated to Drupal 8.5. Core Media not yet in use.

[yaffs-website] / web / modules / contrib / metatag / src / Tests / MetatagXssTest.php

diff --git a/web/modules/contrib/metatag/src/Tests/MetatagXssTest.php b/web/modules/contrib/metatag/src/Tests/MetatagXssTest.php
index 10b2cfa4ce12371201a7fa4aedc5e5de3657225e..da5a3e6d8dee2a51872e73b4ec90241785f57ee3 100644 (file)
--- a/web/modules/contrib/metatag/src/Tests/MetatagXssTest.php
+++ b/web/modules/contrib/metatag/src/Tests/MetatagXssTest.php
@@ -5,7 +5,7 @@ namespace Drupal\metatag\Tests;
 use Drupal\simpletest\WebTestBase;
 
 /**
- * Ensures that metatags do not allow xss vulnerabilities.
+ * Ensures that meta tags do not allow xss vulnerabilities.
  *
  * @group metatag
  */
@@ -19,7 +19,7 @@ class MetatagXssTest extends WebTestBase {
   private $xssTitleString = '<script>alert("xss");</script>';
 
   /**
-   * String that causes an alert when metatags aren't filtered for xss.
+   * String that causes an alert when meta tags aren't filtered for xss.
    *
    * @var string
    */
@@ -33,7 +33,7 @@ class MetatagXssTest extends WebTestBase {
   private $escapedXssTag = '<meta name="abstract" content="&quot;&gt;alert(&quot;xss&quot;);" />';
 
   /**
-   * String that causes an alert when metatags aren't filtered for xss.
+   * String that causes an alert when meta tags aren't filtered for xss.
    *
    * "Image" meta tags are processed differently to others, so this checks for a
    * different string.
@@ -116,7 +116,7 @@ class MetatagXssTest extends WebTestBase {
     $values = [
       'title' => $this->xssTitleString,
       'abstract' => $this->xssString,
-      'image_src' => $this->xssImageString
+      'image_src' => $this->xssImageString,
     ];
     $this->drupalPostForm(NULL, $values, 'Save');
     $this->assertText('Saved the Global Metatag defaults.');
@@ -145,6 +145,8 @@ class MetatagXssTest extends WebTestBase {
    * Verify XSS injected in the entity metatag override field is not rendered.
    */
   public function testXssEntityOverride() {
+    $save_label = (floatval(\Drupal::VERSION) <= 8.3) ? t('Save and publish') : t('Save');
+
     $this->drupalGet('node/add/metatag_node');
     $this->assertResponse(200);
     $edit = [
@@ -153,7 +155,7 @@ class MetatagXssTest extends WebTestBase {
       'field_metatag_field[0][basic][abstract]' => $this->xssString,
       'field_metatag_field[0][advanced][image_src]' => $this->xssImageString,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and publish'));
+    $this->drupalPostForm(NULL, $edit, $save_label);
 
     // Check for the title tag, which will have the HTML tags removed and then
     // be lightly HTML encoded.
@@ -173,13 +175,15 @@ class MetatagXssTest extends WebTestBase {
    * Verify XSS injected in the entity titles are not rendered.
    */
   public function testXssEntityTitle() {
+    $save_label = (floatval(\Drupal::VERSION) <= 8.3) ? t('Save and publish') : t('Save');
+
     $this->drupalGet('node/add/metatag_node');
     $this->assertResponse(200);
     $edit = [
       'title[0][value]' => $this->xssTitleString,
       'body[0][value]' => $this->randomString() . ' ' . $this->randomString(),
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and publish'));
+    $this->drupalPostForm(NULL, $edit, $save_label);
 
     // Check for the title tag, which will have the HTML tags removed and then
     // be lightly HTML encoded.
@@ -191,13 +195,15 @@ class MetatagXssTest extends WebTestBase {
    * Verify XSS injected in the entity fields are not rendered.
    */
   public function testXssEntityBody() {
+    $save_label = (floatval(\Drupal::VERSION) <= 8.3) ? t('Save and publish') : t('Save');
+
     $this->drupalGet('node/add/metatag_node');
     $this->assertResponse(200);
     $edit = [
       'title[0][value]' => $this->randomString(),
       'body[0][value]' => $this->xssTitleString,
     ];
-    $this->drupalPostForm(NULL, $edit, t('Save and publish'));
+    $this->drupalPostForm(NULL, $edit, $save_label);
 
     // Check the body text.
     // $this->assertNoTitle($this->xssTitleString);