Add more test cases when asserting HTML5 Doctype declaration and upda…

…ted README
marcortola · Aug 19, 2019 · 539b153 · bystro · Aug 20, 2019 · 539b153
1 parent b015e74
commit 539b153
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 39 deletions.
diff --git a/README.md b/README.md
@@ -107,6 +107,7 @@ Then /^(\d+) random sitemap URLs? should be alive$/
 ##### HTMLContext
 ```gherkin
 Then the page HTML markup should be valid
+Then /^the page HTML5 doctype declaration should (not |)be valid$
 ```
 ##### PerformanceContext
 ```gherkin

diff --git a/src/Context/HTMLContext.php b/src/Context/HTMLContext.php
@@ -70,11 +70,15 @@ public function thePageHtmlMarkupShouldNotBeValid(): void
      */
     public function thePageHtml5DoctypeDeclarationShouldBeValid(): void
     {
-        $html5DoctypeMarkup = '<!doctype html>';
-
-        Assert::eq(
-            $html5DoctypeMarkup,
-            $this->pageDoctypeMarkup($html5DoctypeMarkup)
+        $pageContent = preg_replace(
+            '/<!--(.|\s)*?-->/',
+            '',
+            $this->getSession()->getPage()->getContent()
+        ) ?? '';
+
+        Assert::startsWith(
+            strtolower(trim($pageContent)),
+            '<!doctype html>'
         );
     }
 
@@ -88,26 +92,4 @@ public function thePageHtml5DoctypeDeclarationShouldNotBeValid(): void
             'The page HTML5 doctype declaration should not be valid.'
         );
     }
-
-    private function pageDoctypeMarkup(string $htmlDoctypeMarkup): string
-    {
-        $pageContent = $this->removeCodeBeforePageDoctypeMarkup(
-            $this->getSession()->getPage()->getContent(),
-            $htmlDoctypeMarkup
-        );
-
-        $pageContentLines = explode(PHP_EOL, $pageContent);
-        return trim(strtolower($pageContentLines[0]));
-    }
-
-    private function removeCodeBeforePageDoctypeMarkup(string $pageContent, string $htmlDoctypeMarkup): string
-    {
-        $htmlDoctypeMarkupPositionInPageContent = stripos($pageContent, $htmlDoctypeMarkup);
-
-        if ($htmlDoctypeMarkupPositionInPageContent != false) {
-            $pageContent = substr($pageContent, $htmlDoctypeMarkupPositionInPageContent);
-        }
-
-        return $pageContent;
-    }
 }
diff --git a/tests/features/html.feature b/tests/features/html.feature
@@ -7,9 +7,12 @@ Feature: HTML feature
 
     When I am on "/html/not-valid-html.html"
     Then the page HTML markup should not be valid
- 
+
     When I am on "/html/valid-html5-doctype-declaration.html"
     Then the page HTML5 doctype declaration should be valid
 
+    When I am on "/html/valid-html4-doctype-declaration.html"
+    Then the page HTML5 doctype declaration should not be valid
+
     When I am on "/html/not-valid-html5-doctype-declaration.html"
     Then the page HTML5 doctype declaration should not be valid
diff --git a/tests/fixtures/web/html/not-valid-html5-doctype-declaration.html b/tests/fixtures/web/html/not-valid-html5-doctype-declaration.html
@@ -1,10 +1,12 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
-<head>
-    <meta charset="utf-8">
-    <title>Invalid HTML5 Doctype declaration</title>
-</head>
-<body>
-<p>Invalid HTML5 Doctype declaration</p>
-</body>
-</html>
+<title>Wrong title</title>
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Valid HTML5 Doctype declaration</title>
+</head>
+<body>
+<p>Valid HTML5 Doctype declaration</p>
+</body>
+</html>
diff --git a/tests/fixtures/web/html/valid-html4-doctype-declaration.html b/tests/fixtures/web/html/valid-html4-doctype-declaration.html
@@ -0,0 +1,10 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Invalid HTML5 Doctype declaration</title>
+</head>
+<body>
+<p>Invalid HTML5 Doctype declaration</p>
+</body>
+</html>
diff --git a/tests/fixtures/web/html/valid-html5-doctype-declaration.html b/tests/fixtures/web/html/valid-html5-doctype-declaration.html
@@ -16,4 +16,4 @@
 <body>
 <p>Valid HTML5 Doctype declaration</p>
 </body>
-</html>
+</html>