Merge pull request #2827 from creative-commoners/pulls/4/broken-build…

…s-cms4 MNT Update unit test to work with both HTML4Value and HTML5Value
silverstripe · Jan 26, 2023 · c26eed2 · c26eed2
2 parents 5316767 + b5a25e4
commit c26eed2
Showing 1 changed file with 45 additions and 4 deletions.
diff --git a/tests/php/Model/SiteTreeTest.php b/tests/php/Model/SiteTreeTest.php
@@ -40,6 +40,9 @@
 use TractorCow\Fluent\Extension\FluentSiteTreeExtension;
 use const RESOURCES_DIR;
 use SilverStripe\Dev\Deprecation;
+use SilverStripe\HTML5\HTML5Value;
+use SilverStripe\View\Parsers\HTMLValue;
+use SilverStripe\View\Parsers\HTML4Value;
 
 class SiteTreeTest extends SapphireTest
 {
@@ -2060,12 +2063,50 @@ public function provideSanitiseExtraMeta(): array
                 '<link rel="canonical" accesskey="X" onclick="alert(1)" name="x" />',
                 '<link rel="canonical" name="x">',
                 'Multiple attributes are removed'
-            ],
+            ]
+        ];
+    }
+
+   /**
+    * @dataProvider provideSanatiseInvalidExtraMeta
+    */
+    public function testSanatiseInvalidExtraMetaHTML4Value(string $extraMeta, string $expected): void
+    {
+        Injector::inst()->registerService(HTML4Value::create(), HTMLValue::class);
+        $siteTree = new SiteTree();
+        $siteTree->ExtraMeta = $extraMeta;
+        $siteTree->write();
+        $this->assertSame(
+            $expected,
+            $siteTree->ExtraMeta,
+            'Invalid HTML is converted to valid HTML and parsed'
+        );
+    }
+
+    /**
+     * @dataProvider provideSanatiseInvalidExtraMeta
+     */
+    public function testSanatiseInvalidExtraMetaHTML5Value(string $extraMeta): void
+    {
+        // HTML5Value comes from the module silverstripe/html5
+        if (!class_exists(HTML5Value::class)) {
+            $this->markTestSkipped('HTML5Value class does not exist');
+        }
+        Injector::inst()->registerService(HTML5Value::create(), HTMLValue::class);
+        $this->expectException(ValidationException::class);
+        $this->expectExceptionMessage('Custom Meta Tags does not contain valid HTML');
+        $siteTree = new SiteTree();
+        $siteTree->ExtraMeta = $extraMeta;
+        $siteTree->write();
+    }
+
+    public function provideSanatiseInvalidExtraMeta(): array
+    {
+        return [
             [
                 '<link rel="canonical" href="valid" ;;// somethingdodgy < onmouseover=alert(1)',
-                '<link rel="canonical" href="valid" somethingdodgy="">',
-                'Invalid HTML is converted to valid HTML and parsed'
-            ],
+                '<link rel="canonical" href="valid" somethingdodgy="">'
+            ]
         ];
     }
 }