drevops · AlexSkrypnyk · Jul 5, 2026 · Jul 5, 2026 · Jul 5, 2026 · Jul 5, 2026
diff --git a/src/AccessibilityTrait.php b/src/AccessibilityTrait.php
@@ -895,8 +895,18 @@ protected function accessibilityRenderIssueList(string $heading, string $css_cla
 
   /**
    * Render the scenario-level JUnit XML report from collected results.
+   *
+   * Violations are gated by the scenario's effective threshold, exactly as the
+   * pass/fail gate is: only violations meeting the threshold are serialised as
+   * `<failure>` cases, so an advisory run (threshold `never`) writes a report
+   * with zero failures instead of one that reddens a JUnit-consuming CI check.
+   * Violations below the threshold are recorded as passing cases carrying the
+   * finding in `<system-out>`, so they stay visible without failing the report.
+   * The `tests` and `failures` counts reflect the actual emitted `<testcase>`
+   * elements, one per affected node.
    */
   protected function accessibilityRenderJunit(): string {
+    $threshold = $this->accessibilityEffectiveThreshold();
     $suites_xml = '';
     $total_tests = 0;
     $total_failures = 0;
@@ -906,13 +916,12 @@ protected function accessibilityRenderJunit(): string {
       $violations = $r['result']['violations'] ?? [];
       $passes = $r['result']['passes'] ?? [];
 
-      $tests = count($violations) + count($passes);
-      $failures = count($violations);
-      $total_tests += $tests;
-      $total_failures += $failures;
-
       $cases_xml = '';
+      $tests = 0;
+      $failures = 0;
+
       foreach ($violations as $v) {
+        $failing = $this->accessibilityFilterViolations([$v], $threshold) !== [];
         $rule_id = (string) ($v['id'] ?? 'unknown');
         $impact = (string) ($v['impact'] ?? 'unknown');
         $help = (string) ($v['help'] ?? '');
@@ -921,26 +930,30 @@ protected function accessibilityRenderJunit(): string {
         foreach ($v['nodes'] ?? [] as $node) {
           $target = static::accessibilityStringifyTarget($node['target'] ?? []);
           $html = trim((string) ($node['html'] ?? ''));
-
-          $message = sprintf('[%s] %s', $impact, $help);
           $details = sprintf("URL: %s\nRule: %s\nTarget: %s\nHTML: %s\nDocs: %s", $url, $rule_id, $target, $html, $help_url);
+          $classname = htmlspecialchars('accessibility.' . $rule_id, ENT_XML1 | ENT_QUOTES);
+          $name = htmlspecialchars($target ?: $rule_id, ENT_XML1 | ENT_QUOTES);
+          $tests++;
+
+          if (!$failing) {
+            $cases_xml .= sprintf('<testcase classname="%s" name="%s"><system-out>%s</system-out></testcase>', $classname, $name, htmlspecialchars('[advisory] ' . $details, ENT_XML1 | ENT_QUOTES));
+            continue;
+          }
 
-          $cases_xml .= sprintf(
-            '<testcase classname="accessibility.%s" name="%s"><failure type="%s" message="%s">%s</failure></testcase>',
-            htmlspecialchars($rule_id, ENT_XML1 | ENT_QUOTES),
-            htmlspecialchars($target ?: $rule_id, ENT_XML1 | ENT_QUOTES),
-            htmlspecialchars($impact, ENT_XML1 | ENT_QUOTES),
-            htmlspecialchars($message, ENT_XML1 | ENT_QUOTES),
-            htmlspecialchars($details, ENT_XML1 | ENT_QUOTES)
-          );
+          $failures++;
+          $cases_xml .= sprintf('<testcase classname="%s" name="%s"><failure type="%s" message="%s">%s</failure></testcase>', $classname, $name, htmlspecialchars($impact, ENT_XML1 | ENT_QUOTES), htmlspecialchars(sprintf('[%s] %s', $impact, $help), ENT_XML1 | ENT_QUOTES), htmlspecialchars($details, ENT_XML1 | ENT_QUOTES));
         }
       }
 
       foreach ($passes as $p) {
         $rule_id = (string) ($p['id'] ?? 'unknown');
+        $tests++;
         $cases_xml .= sprintf('<testcase classname="accessibility.%s" name="%s passed"/>', htmlspecialchars($rule_id, ENT_XML1 | ENT_QUOTES), htmlspecialchars($rule_id, ENT_XML1 | ENT_QUOTES));
       }
 
+      $total_tests += $tests;
+      $total_failures += $failures;
+
       $suites_xml .= sprintf('<testsuite name="%s" tests="%d" failures="%d" errors="0">%s</testsuite>', htmlspecialchars((string) $url, ENT_XML1 | ENT_QUOTES), $tests, $failures, $cases_xml);
     }
 

diff --git a/tests/behat/bootstrap/BehatCliContext.php b/tests/behat/bootstrap/BehatCliContext.php
@@ -215,6 +215,45 @@ public function fileMatchingShouldExist($pattern)
     Assert::assertNotEmpty($matches, sprintf('No file matching "%s" was found in the working directory.', $pattern));
   }
 
+  /**
+   * Checks that the first file matching a glob pattern contains a substring.
+   */
+  #[Then('a file matching :pattern should contain:')]
+  public function fileMatchingShouldContain(string $pattern, PyStringNode $text): void
+  {
+    $this->assertFileMatchingContains($pattern, $text, true);
+  }
+
+  /**
+   * Checks that the first file matching a glob pattern lacks a substring.
+   */
+  #[Then('a file matching :pattern should not contain:')]
+  public function fileMatchingShouldNotContain(string $pattern, PyStringNode $text): void
+  {
+    $this->assertFileMatchingContains($pattern, $text, false);
+  }
+
+  /**
+   * Asserts the first matching file does or does not contain a substring.
+   */
+  protected function assertFileMatchingContains(string $pattern, PyStringNode $text, bool $shouldContain): void
+  {
+    $matches = glob($this->workingDir . DIRECTORY_SEPARATOR . $pattern) ?: [];
+    Assert::assertNotEmpty($matches, sprintf('No file matching "%s" was found in the working directory.', $pattern));
+    // Sort so the file inspected is deterministic when several patterns match.
+    sort($matches);
+
+    $content = (string) file_get_contents($matches[0]);
+    $needle = trim((string) $text);
+
+    if (str_contains($content, $needle) === $shouldContain) {
+      return;
+    }
+
+    $message = $shouldContain ? 'File "%s" does not contain "%s".' : 'File "%s" unexpectedly contains "%s".';
+    throw new UnexpectedValueException(sprintf($message, $matches[0], $needle));
+  }
+
   /**
    * Sets specified ENV variable.
    *

diff --git a/tests/behat/features/accessibility.feature b/tests/behat/features/accessibility.feature
@@ -100,3 +100,26 @@ Feature: Check that AccessibilityTrait works
     When I run "behat --no-colors"
     Then it should pass
     And a file matching ".logs/test_results/accessibility/accessibility_report_*.html" should exist
+
+  @trait:AccessibilityTrait
+  Scenario: Warning mode writes a JUnit report with no failures
+    Given some behat configuration
+    And scenario steps tagged with "@javascript @accessibility:warning":
+      """
+      Given I visit "/sites/default/files/accessibility_violations.html"
+      Then I should see "Inaccessible Page"
+      """
+    When I run "behat --no-colors"
+    Then it should pass
+    And a file matching ".logs/test_results/accessibility/junit-*.xml" should contain:
+      """
+      failures="0"
+      """
+    And a file matching ".logs/test_results/accessibility/junit-*.xml" should not contain:
+      """
+      <failure
+      """
+    And a file matching ".logs/test_results/accessibility/junit-*.xml" should contain:
+      """
+      <system-out>
+      """
diff --git a/tests/phpunit/src/AccessibilityTraitTest.php b/tests/phpunit/src/AccessibilityTraitTest.php
@@ -346,6 +346,75 @@ public function testAggregateCaptureFormatsUrlsAndRecordsEntry(): void {
     $this->assertSame('/captured/dir', AccessibilityTraitTestImplementation::testGetAggregateReportDir());
   }
 
+  #[DataProvider('dataProviderRenderJunitFailuresByThreshold')]
+  public function testRenderJunitFailuresByThreshold(?string $threshold, int $expected_failures): void {
+    $xml = $this->testObject->testRenderJunit(static::createJunitResults(), 'Feature', 'Scenario', $threshold);
+
+    $doc = simplexml_load_string($xml);
+    $this->assertInstanceOf(\SimpleXMLElement::class, $doc, 'The rendered report is well-formed XML.');
+    // Only violations meeting the effective threshold become <failure> cases.
+    $this->assertCount($expected_failures, $doc->xpath('//failure') ?: []);
+    // Every emitted testcase is counted, so tests stays 5 (3 violations + 2
+    // passes) whether a violation is a failure or advisory.
+    $this->assertCount(5, $doc->xpath('//testcase') ?: []);
+    $this->assertSame('5', (string) $doc['tests']);
+    // The file-level and suite-level failure counts agree.
+    $this->assertSame((string) $expected_failures, (string) $doc['failures']);
+    $this->assertSame((string) $expected_failures, (string) $doc->testsuite['failures']);
+  }
+
+  public static function dataProviderRenderJunitFailuresByThreshold(): array {
+    return [
+      'warning (never) fails on nothing' => ['never', 0],
+      'default (null) resolves to any and fails on all' => [NULL, 3],
+      'any fails on all' => ['any', 3],
+      'critical fails on the critical only' => ['critical', 1],
+      'serious fails on critical and serious' => ['serious', 2],
+      'moderate fails on all three' => ['moderate', 3],
+    ];
+  }
+
+  public function testRenderJunitWarningKeepsAdvisoryViolationsVisibleWithoutFailing(): void {
+    $xml = $this->testObject->testRenderJunit(static::createJunitResults(), 'Feature', 'Scenario', 'never');
+
+    $doc = simplexml_load_string($xml);
+    $this->assertInstanceOf(\SimpleXMLElement::class, $doc);
+    // Advisory mode: no violation is serialised as a failure...
+    $this->assertCount(0, $doc->xpath('//failure') ?: []);
+    $this->assertStringNotContainsString('<failure', $xml);
+    // ...but every finding stays visible as a passing testcase with <system-out>.
+    $this->assertCount(3, $doc->xpath('//system-out') ?: []);
+    $this->assertStringContainsString('classname="accessibility.image-alt"', $xml);
+    $this->assertStringContainsString('classname="accessibility.link-name"', $xml);
+  }
+
+  public function testRenderJunitCountsEveryEmittedTestcase(): void {
+    $results = [
+      [
+        'url' => '/',
+        'rules' => 'wcag2a',
+        'result' => [
+          'violations' => [
+            ['id' => 'image-alt', 'impact' => 'critical', 'help' => 'Images must have alternative text', 'helpUrl' => 'https://example.com/image-alt', 'nodes' => [['target' => ['img.a'], 'html' => '<img class="a">'], ['target' => ['img.b'], 'html' => '<img class="b">']]],
+          ],
+          'incomplete' => [],
+          'passes' => [['id' => 'document-title'], ['id' => 'html-has-lang'], ['id' => 'region']],
+        ],
+      ],
+    ];
+
+    $xml = $this->testObject->testRenderJunit($results, 'Feature', 'Scenario', 'any');
+
+    $doc = simplexml_load_string($xml);
+    $this->assertInstanceOf(\SimpleXMLElement::class, $doc);
+    // One <failure> per affected node (2), plus three passing testcases: tests
+    // and failures count actual emitted <testcase> elements, not violations.
+    $this->assertCount(2, $doc->xpath('//failure') ?: []);
+    $this->assertCount(5, $doc->xpath('//testcase') ?: []);
+    $this->assertSame('5', (string) $doc['tests']);
+    $this->assertSame('2', (string) $doc['failures']);
+  }
+
   /**
    * Render a sample accumulator through the full data + render pipeline.
    *
@@ -479,6 +548,31 @@ protected static function createCleanAggregate(): array {
     ];
   }
 
+  /**
+   * Build a scenario result with one violation per impact plus two passes.
+   *
+   * @return array<int, array{url: string, rules: string, result: array<string, mixed>}>
+   *   A single-page result: critical, serious and moderate violations (one
+   *   affected node each) alongside two passing rules.
+   */
+  protected static function createJunitResults(): array {
+    return [
+      [
+        'url' => '/',
+        'rules' => 'wcag2a,wcag2aa',
+        'result' => [
+          'violations' => [
+            ['id' => 'image-alt', 'impact' => 'critical', 'help' => 'Images must have alternative text', 'helpUrl' => 'https://example.com/image-alt', 'nodes' => [['target' => ['img'], 'html' => '<img src="x">']]],
+            ['id' => 'link-name', 'impact' => 'serious', 'help' => 'Links must have discernible text', 'helpUrl' => 'https://example.com/link-name', 'nodes' => [['target' => ['a'], 'html' => '<a href="#"></a>']]],
+            ['id' => 'region', 'impact' => 'moderate', 'help' => 'All page content should be contained by landmarks', 'helpUrl' => 'https://example.com/region', 'nodes' => [['target' => ['div'], 'html' => '<div></div>']]],
+          ],
+          'incomplete' => [],
+          'passes' => [['id' => 'document-title'], ['id' => 'html-has-lang']],
+        ],
+      ],
+    ];
+  }
+
 }
 
 /**
@@ -560,4 +654,13 @@ public function testCapture(array $results, string $feature, string $scenario, s
     $this->accessibilityAggregateCapture($dir);
   }
 
+  public function testRenderJunit(array $results, string $feature, string $scenario, ?string $threshold = NULL): string {
+    $this->accessibilityResults = $results;
+    $this->accessibilityFeatureName = $feature;
+    $this->accessibilityScenarioName = $scenario;
+    $this->accessibilityScenarioThreshold = $threshold;
+
+    return $this->accessibilityRenderJunit();
+  }
+
 }