Merge HTML tests into MAG guidelines structure

features/cli/display_failing_result.feature

@@ -6,11 +6,11 @@ Feature: Display failing result
     Then it should fail with:
       """
       ✗ http://localhost:54321/missing_main_heading.html
-        * Headings: Exactly one main heading
+        * Structure: Headings: Exactly one main heading
           - Found 0 h1 elements.
 
       For details on how to fix these errors, please see the following pages:
-        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/html/headings.shtml
+        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/mobile/structure/headings
       """
 
   Scenario: One standard generates a warning
@@ -19,13 +19,10 @@ Feature: Display failing result
     Then it should fail with:
       """
       ✓ http://localhost:54321/subheading_first.html
-        ⚠ Headings: Headings must be in ascending order
-          - First heading was not a main heading: /html/body/h3
         ⚠ Structure: Headings: Headings must be in ascending order
           - First heading was not a main heading: /html/body/h3
 
       For details on how to fix these errors, please see the following pages:
-        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/html/headings.shtml
         - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/mobile/structure/headings
       """
 
@@ -35,17 +32,14 @@ Feature: Display failing result
     Then it should fail with:
       """
       ✗ http://localhost:54321/two_headings_failures_and_one_warning.html
-        * Headings: Content must follow headings
-          - No content follows: /html/body/h2
-        * Headings: Exactly one main heading
-          - Found 0 h1 elements.
-        ⚠ Headings: Headings must be in ascending order
-          - First heading was not a main heading: /html/body/h2
         ⚠ Structure: Headings: Headings must be in ascending order
           - First heading was not a main heading: /html/body/h2
+        * Structure: Headings: Exactly one main heading
+          - Found 0 h1 elements.
+        * Structure: Headings: Content must follow headings
+          - No content follows: /html/body/h2
 
       For details on how to fix these errors, please see the following pages:
-        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/html/headings.shtml
         - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/mobile/structure/headings
       """
 
@@ -55,12 +49,12 @@ Feature: Display failing result
     Then it should fail with:
       """
       ✗ http://localhost:54321/heading_and_title_attribute_failures.html
-        * Headings: Exactly one main heading
+        * Structure: Headings: Exactly one main heading
           - Found 0 h1 elements.
-        * Title attributes: Title attributes only on inputs
+        * Text equivalents: Tooltips and supplementary information: Title attributes only on inputs
           - Non-input element has title attribute: /html/body/p/span
 
       For details on how to fix these errors, please see the following pages:
-        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/html/headings.shtml
-        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/html/title-attributes.shtml
+        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/mobile/structure/headings
+        - http://www.bbc.co.uk/guidelines/futuremedia/accessibility/mobile/text-equivalents/tooltips-and-supplementary-information
       """

features/cli/display_result_summary.feature

@@ -6,15 +6,15 @@ Feature: Display result summary
       """
       page("http://localhost:54321/perfect.html")
       page("http://localhost:54321/missing_main_heading.html", {
-        skip: "Headings: Exactly one main heading"
+        skip: "Structure: Headings: Exactly one main heading"
       })
       page("http://localhost:54321/missing_main_heading.html?again!")
       page("http://localhost:54321/subheading_first.html")
       """
     When I run `bbc-a11y`
     Then it should fail with:
       """
-      4 pages checked, 1 error found, 2 warnings, 1 standard skipped
+      4 pages checked, 1 error found, 1 warning, 1 standard skipped
       """
 
   Scenario: Reminds users to consider usability beyond lint results

features/cli/json_reporter.feature

@@ -4,7 +4,7 @@ Feature: JSON Reporter
     And a file named "a11y.js" with:
       """
       page("http://localhost:54321/perfect.html", {
-        skip: ["Main landmark: Exactly one Main landmark"]
+        skip: ["Structure: Containers and landmarks: Exactly one main landmark"]
       })
       page("http://localhost:54321/missing_main_heading.html")
       """

features/cli/skipping_standards.feature

@@ -5,7 +5,7 @@ Feature: Skipping Standards
     And a file named "a11y.js" with:
       """
       page("http://localhost:54321/missing_main_heading.html", {
-        skip: "Headings: Exactly one main heading"
+        skip: "Structure: Headings: Exactly one main heading"
       })
       """
     When I run `bbc-a11y`
@@ -19,7 +19,7 @@ Feature: Skipping Standards
     And a file named "a11y.js" with:
       """
       page("http://localhost:54321/two_headings_failures.html", {
-        only: "Headings: Exactly one main heading"
+        only: "Structure: Headings: Exactly one main heading"
       })
       """
     When I run `bbc-a11y`

features/cli/summarise_tests.feature

@@ -6,15 +6,23 @@ Feature: Summarise Tests
       """
       Tests covered by bbc-a11y:
 
-      Core purpose: Core purpose must be defined
-      Type: manual
-      Fails for each page whose core purpose (to inform, educate, or entertain) is not clearly defined
+      Minimum text size: Text cannot be too small
+      Type: automated
+      Fails for each text node with a computed font size of less than 11px
 
-      Colour and meaning: Information conveyed with colour must also be identifiable from context or markup
-      Type: manual
-      Fails for each page whose information conveyed with colour is not also identifiable from context or markup
+      Principles: All documents must have a W3C recommended doctype
+      Type: automated
+      Fails for each page that is missing a w3c recommended doctype (e.g. <!DOCTYPE html>)
+
+      Principles: Markup must validate against doctype
+      Type: automated
+      Fails for each page whose markup does not validate against a w3c standards validator
+
+      Principles: Anchors must have hrefs
+      Type: automated
+      Fails for each visible <a> element with no href attribute
 
-      Colour contrast: Colour combinations must pass the WCAG colour contrast check
+      Audio & Video: Alternatives for audio and visual content: Alternative delivery for embedded media must be provided
       Type: manual
-      Fails for each page whose colour combinations fail the WCAG colour contrast check
+      Fails for each page that includes embedded media with no alternative delivery
       """

features/disabled_caching.feature

@@ -20,6 +20,6 @@ Feature: Disabled Caching
     Then it should fail with:
       """
       ✗ http://localhost:54321/goodThenBad.html
-        * Headings: Exactly one main heading
+        * Structure: Headings: Exactly one main heading
           - Found 0 h1 elements.
       """

features/setting_cookies.feature

@@ -27,11 +27,11 @@ Feature: Setting Cookies
       ✓ http://localhost:54321/good_with_cookie.html
 
       ✗ http://localhost:54321/good_with_cookie.html
-        * Main landmark: Exactly one Main landmark
+        * Structure: Containers and landmarks: Exactly one main landmark
           - Found 0 elements with role="main".
 
       ✗ http://localhost:54321/good_with_cookie.html
-        * Main landmark: Exactly one Main landmark
+        * Structure: Containers and landmarks: Exactly one main landmark
           - Found 0 elements with role="main".
 
       ✓ http://localhost:54321/good_with_cookie.html