From 276926a5e2b743a00e8e1766ebf8dbd571ced2d1 Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2026 06:01:31 -0600
Subject: [PATCH 1/5] Add regression test for GDPR disabled-notice dangling
 aria-labelledby

---
 tests/phpunit/fields/test_FrmFieldGdpr.php | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 tests/phpunit/fields/test_FrmFieldGdpr.php

diff --git a/tests/phpunit/fields/test_FrmFieldGdpr.php b/tests/phpunit/fields/test_FrmFieldGdpr.php
new file mode 100644
index 0000000000..55c85b1632
--- /dev/null
+++ b/tests/phpunit/fields/test_FrmFieldGdpr.php
@@ -0,0 +1,58 @@
+<?php
+/**
+ * @group fields
+ */
+class test_FrmFieldGdpr extends FrmUnitTest {
+
+	/**
+	 * @covers FrmFieldGdpr::include_front_form_file
+	 */
+	public function test_disabled_notice_has_no_dangling_aria_labelledby() {
+		$this->set_current_user_to_1();
+		FrmAppHelper::get_settings()->enable_gdpr = false;
+
+		$html = $this->render_gdpr_field( 543 );
+
+		$this->assertStringNotContainsString(
+			'aria-labelledby',
+			$html,
+			'The disabled-notice branch has no element carrying the referenced id, so aria-labelledby should not be printed.'
+		);
+		$this->assertStringContainsString( 'GDPR field is disabled', $html );
+	}
+
+	/**
+	 * @covers FrmFieldGdpr::include_front_form_file
+	 */
+	public function test_enabled_field_still_has_aria_labelledby() {
+		FrmAppHelper::get_settings()->enable_gdpr = true;
+
+		$html = $this->render_gdpr_field( 544 );
+
+		$this->assertStringContainsString( 'aria-labelledby="frm-gdpr-accept-544"', $html );
+		$this->assertStringContainsString( 'id="frm-gdpr-accept-544"', $html );
+	}
+
+	/**
+	 * @param int $field_id
+	 *
+	 * @return string
+	 */
+	private function render_gdpr_field( $field_id ) {
+		$field_type = new FrmFieldGdpr(
+			array(
+				'id'                  => $field_id,
+				'gdpr_agreement_text' => 'I agree',
+				'value'               => '',
+			)
+		);
+
+		return $field_type->include_front_field_input(
+			array(
+				'html_id'    => 'field_gdpr_' . $field_id,
+				'field_name' => 'item_meta[' . $field_id . ']',
+			),
+			array()
+		);
+	}
+}

From 0d719e9aa259084e42995d2cf05592d1650641eb Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2026 06:06:01 -0600
Subject: [PATCH 2/5] Drop dangling aria-labelledby from GDPR disabled-notice
 branch

No element in that branch carries the referenced id, so the ARIA
reference had no accessible name to point to.
---
 classes/views/frm-fields/front-end/gdpr/gdpr-field.php | 2 +-
 tests/phpunit/fields/test_FrmFieldGdpr.php             | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/classes/views/frm-fields/front-end/gdpr/gdpr-field.php b/classes/views/frm-fields/front-end/gdpr/gdpr-field.php
index 0339677907..e5f80e0fe7 100644
--- a/classes/views/frm-fields/front-end/gdpr/gdpr-field.php
+++ b/classes/views/frm-fields/front-end/gdpr/gdpr-field.php
@@ -26,7 +26,7 @@
 	</label>
 </div>
 <?php elseif ( current_user_can( 'frm_edit_forms' ) ) : ?>
-	<div class="frm_checkbox" role="group" aria-labelledby="<?php echo esc_attr( $label_id ); ?>">
+	<div class="frm_checkbox" role="group">
 		<label for="<?php echo esc_attr( $label_id ); ?>">
 			<?php
 			/* translators: %1$s: Link HTML, %2$s: End link */
diff --git a/tests/phpunit/fields/test_FrmFieldGdpr.php b/tests/phpunit/fields/test_FrmFieldGdpr.php
index 55c85b1632..d0ddeb7d29 100644
--- a/tests/phpunit/fields/test_FrmFieldGdpr.php
+++ b/tests/phpunit/fields/test_FrmFieldGdpr.php
@@ -8,7 +8,9 @@ class test_FrmFieldGdpr extends FrmUnitTest {
 	 * @covers FrmFieldGdpr::include_front_form_file
 	 */
 	public function test_disabled_notice_has_no_dangling_aria_labelledby() {
-		$this->set_current_user_to_1();
+		$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
+		wp_set_current_user( $user_id );
+		wp_get_current_user()->add_cap( 'frm_edit_forms' );
 		FrmAppHelper::get_settings()->enable_gdpr = false;
 
 		$html = $this->render_gdpr_field( 543 );

From 90de42b12cc6a06b246e258428e6660fb1673a76 Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2026 06:08:03 -0600
Subject: [PATCH 3/5] Restore enable_gdpr global after each GDPR field test

---
 tests/phpunit/fields/test_FrmFieldGdpr.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/tests/phpunit/fields/test_FrmFieldGdpr.php b/tests/phpunit/fields/test_FrmFieldGdpr.php
index d0ddeb7d29..bc30637952 100644
--- a/tests/phpunit/fields/test_FrmFieldGdpr.php
+++ b/tests/phpunit/fields/test_FrmFieldGdpr.php
@@ -4,6 +4,22 @@
  */
 class test_FrmFieldGdpr extends FrmUnitTest {
 
+	/**
+	 * @var bool
+	 */
+	private $original_enable_gdpr;
+
+	public function setUp(): void {
+		parent::setUp();
+		// $frm_settings is a process-wide global, not reset between tests by the DB rollback.
+		$this->original_enable_gdpr = FrmAppHelper::get_settings()->enable_gdpr;
+	}
+
+	public function tearDown(): void {
+		FrmAppHelper::get_settings()->enable_gdpr = $this->original_enable_gdpr;
+		parent::tearDown();
+	}
+
 	/**
 	 * @covers FrmFieldGdpr::include_front_form_file
 	 */

From b40ae7d4856a274b7850ed3944defee8f436bb06 Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2026 06:17:38 -0600
Subject: [PATCH 4/5] Harden GDPR field test fixture with type/default_value
 keys

---
 tests/phpunit/fields/test_FrmFieldGdpr.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/phpunit/fields/test_FrmFieldGdpr.php b/tests/phpunit/fields/test_FrmFieldGdpr.php
index bc30637952..1abde4920a 100644
--- a/tests/phpunit/fields/test_FrmFieldGdpr.php
+++ b/tests/phpunit/fields/test_FrmFieldGdpr.php
@@ -21,11 +21,13 @@ public function tearDown(): void {
 	}
 
 	/**
-	 * @covers FrmFieldGdpr::include_front_form_file
+	 * @covers FrmFieldType::include_front_field_input
 	 */
 	public function test_disabled_notice_has_no_dangling_aria_labelledby() {
 		$user_id = $this->factory->user->create( array( 'role' => 'administrator' ) );
 		wp_set_current_user( $user_id );
+		// FrmAppHelper::maybe_add_permissions() grants this via a separate WP_User
+		// instance, which doesn't reach the current_user_can() cache for this request.
 		wp_get_current_user()->add_cap( 'frm_edit_forms' );
 		FrmAppHelper::get_settings()->enable_gdpr = false;
 
@@ -40,7 +42,7 @@ public function test_disabled_notice_has_no_dangling_aria_labelledby() {
 	}
 
 	/**
-	 * @covers FrmFieldGdpr::include_front_form_file
+	 * @covers FrmFieldType::include_front_field_input
 	 */
 	public function test_enabled_field_still_has_aria_labelledby() {
 		FrmAppHelper::get_settings()->enable_gdpr = true;
@@ -60,8 +62,10 @@ private function render_gdpr_field( $field_id ) {
 		$field_type = new FrmFieldGdpr(
 			array(
 				'id'                  => $field_id,
+				'type'                => 'gdpr',
 				'gdpr_agreement_text' => 'I agree',
 				'value'               => '',
+				'default_value'       => '',
 			)
 		);
 

From 50227d03119294b6f79faa3e6980703379a0af07 Mon Sep 17 00:00:00 2001
From: "vivi-the-going-merry[bot]"
 <308115520+vivi-the-going-merry[bot]@users.noreply.github.com>
Date: Thu, 24 Sep 2026 06:23:47 -0600
Subject: [PATCH 5/5] Correct docblock: enable_gdpr is stored as an int, not a
 bool

---
 tests/phpunit/fields/test_FrmFieldGdpr.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/phpunit/fields/test_FrmFieldGdpr.php b/tests/phpunit/fields/test_FrmFieldGdpr.php
index 1abde4920a..1c7adecf79 100644
--- a/tests/phpunit/fields/test_FrmFieldGdpr.php
+++ b/tests/phpunit/fields/test_FrmFieldGdpr.php
@@ -5,7 +5,7 @@
 class test_FrmFieldGdpr extends FrmUnitTest {
 
 	/**
-	 * @var bool
+	 * @var int
 	 */
 	private $original_enable_gdpr;