From 3ec9e79d42e35af2a54071cead8b58af5d692641 Mon Sep 17 00:00:00 2001
From: Jun Pataleta <jun@moodle.com>
Date: Wed, 10 Sep 2025 07:49:25 +0800
Subject: [PATCH] MDL-86501 form: Fix unit tests

The change in the calendar button from an `<a>` tag to a native
`<button>` tag means the `\HTML_QuickForm_group::getValue()` will have
a different result and the `test_onquickformevent()` tests must be
adjusted accordingly.
---
 lib/form/tests/dateselector_test.php     | 13 +++++++------
 lib/form/tests/datetimeselector_test.php | 17 +++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/form/tests/dateselector_test.php b/lib/form/tests/dateselector_test.php
index 5583b6c3b6b..eeb5692648d 100644
--- a/lib/form/tests/dateselector_test.php
+++ b/lib/form/tests/dateselector_test.php
@@ -147,7 +147,7 @@ final class dateselector_test extends \advanced_testcase {
      * Testcase to check onQuickformEvent
      */
     public function test_onquickformevent(): void {
-        global $USER;
+        global $OUTPUT, $USER;
         $testvals = $this->testvals;
         // Get dummy form for data.
         $mform = $this->mform;
@@ -160,11 +160,12 @@ final class dateselector_test extends \advanced_testcase {
             $elparams = array('optional'=>false, 'timezone' => $vals['timezone']);
             $el = $this->mform->addElement('date_selector', 'dateselector', null, $elparams);
             $this->assertTrue($el instanceof MoodleQuickForm_date_selector);
-            $expectedvalues = array(
-                'day' => array($vals['day']),
-                'month' => array($vals['month']),
-                'year' => array($vals['year'])
-                );
+            $expectedvalues = [
+                'day' => [$vals['day']],
+                'month' => [$vals['month']],
+                'year' => [$vals['year']],
+                'calendar' => $OUTPUT->pix_icon('i/calendar', ''),
+            ];
             $mform->_submitValues = array('dateselector' => $vals['timestamp']);
             $el->onQuickFormEvent('updateValue', null, $mform);
             $this->assertSame($expectedvalues, $el->getValue());
diff --git a/lib/form/tests/datetimeselector_test.php b/lib/form/tests/datetimeselector_test.php
index 93e32092994..848cb61f366 100644
--- a/lib/form/tests/datetimeselector_test.php
+++ b/lib/form/tests/datetimeselector_test.php
@@ -159,7 +159,7 @@ final class datetimeselector_test extends \advanced_testcase {
      * Testcase to check onQuickformEvent
      */
     public function test_onquickformevent(): void {
-        global $USER;
+        global $OUTPUT, $USER;
         $testvals = $this->testvals;
         // Get dummy form for data.
         $mform = $this->mform;
@@ -172,13 +172,14 @@ final class datetimeselector_test extends \advanced_testcase {
             $elparams = array('optional'=>false, 'timezone' => $vals['timezone']);
             $el = $this->mform->addElement('date_time_selector', 'dateselector', null, $elparams);
             $this->assertTrue($el instanceof MoodleQuickForm_date_time_selector);
-            $expectedvalues = array(
-                'day' => array($vals['day']),
-                'month' => array($vals['month']),
-                'year' => array($vals['year']),
-                'hour' => array($vals['hour']),
-                'minute' => array($vals['minute'])
-                );
+            $expectedvalues = [
+                'day' => [$vals['day']],
+                'month' => [$vals['month']],
+                'year' => [$vals['year']],
+                'hour' => [$vals['hour']],
+                'minute' => [$vals['minute']],
+                'calendar' => $OUTPUT->pix_icon('i/calendar', ''),
+            ];
             $mform->_submitValues = array('dateselector' => $vals['timestamp']);
             $el->onQuickFormEvent('updateValue', null, $mform);
             $this->assertSame($expectedvalues, $el->getValue());