Merge branch 'MDL-78728' of https://github.com/paulholden/moodle

moodle · Sep 15, 2023 · 632e603 · 632e603
2 parents 62a91c8 + d005176
commit 632e603
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 26 deletions.
diff --git a/lib/form/amd/build/collapsesections.min.js b/lib/form/amd/build/collapsesections.min.js
diff --git a/lib/form/amd/build/collapsesections.min.js.map b/lib/form/amd/build/collapsesections.min.js.map
diff --git a/lib/form/amd/src/collapsesections.js b/lib/form/amd/src/collapsesections.js
@@ -26,6 +26,7 @@ import $ from 'jquery';
 import Pending from 'core/pending';
 
 const SELECTORS = {
+    FORM: '.mform',
     FORMHEADER: '.fheader',
     FORMCONTAINER: 'fieldset > .fcontainer',
 };
@@ -45,8 +46,9 @@ export const init = collapsesections => {
     // All jQuery in this code can be replaced when MDL-71979 is integrated (move to Bootstrap 5).
     const pendingPromise = new Pending('core_form/collapsesections');
     const collapsemenu = document.querySelector(collapsesections);
-    const formParent = collapsemenu.closest('form');
-    const formContainers = formParent?.querySelectorAll(SELECTORS.FORMCONTAINER) || [];
+
+    const formParent = collapsemenu.closest(SELECTORS.FORM);
+    const formContainers = formParent.querySelectorAll(SELECTORS.FORMCONTAINER);
 
     collapsemenu.addEventListener('keydown', e => {
         if (e.key === 'Enter' || e.key === ' ') {
@@ -84,7 +86,7 @@ export const init = collapsesections => {
     });
 
     // Ensure collapse menu button adds aria-controls attribute referring to each collapsible element.
-    const collapseElements = $(SELECTORS.FORMHEADER);
+    const collapseElements = formParent.querySelectorAll(SELECTORS.FORMHEADER);
     const collapseElementIds = [...collapseElements].map((element, index) => {
         element.id = element.id || `collapseElement-${index}`;
         return element.id;

diff --git a/lib/tests/behat/readonlyform.feature b/lib/tests/behat/readonlyform.feature
@@ -6,27 +6,23 @@ Feature: Read-only forms should work
 
   @javascript
   Scenario: Shortforms expand collapsing should work for read-only forms - one-section form
-    Given the following "courses" exist:
-      | fullname | shortname | format |
-      | Course 1 | C1        | topics |
-    And the following "activities" exist:
-      | activity   | name | intro                                                                        | course | idnumber |
-      | label      | L1   | <a href="../lib/tests/fixtures/readonlyform.php?sections=1">Fixture link</a> | C1     | label1   |
-    Given I am on the "C1" "Course" page logged in as "admin"
-    And I click on "Fixture link" "link" in the "region-main" "region"
-    When I expand all fieldsets
-    Then the field "Name" matches value "Important information"
+    Given I log in as "admin"
+    And I visit "/lib/tests/fixtures/readonlyform.php?sections=1"
+    When I press "First section"
+    Then "Name" "field" should be visible
+    And the field "Name" matches value "Important information"
+    And I press "First section"
+    And "Name" "field" should not be visible
 
   @javascript
   Scenario: Shortforms expand collapsing should work for read-only forms - two-section form
-    Given the following "courses" exist:
-      | fullname | shortname | format |
-      | Course 1 | C1        | topics |
-    And the following "activities" exist:
-      | activity   | name | intro                                                                        | course | idnumber |
-      | label      | L1   | <a href="../lib/tests/fixtures/readonlyform.php?sections=2">Fixture link</a> | C1     | label1   |
-    Given I am on the "C1" "Course" page logged in as "admin"
-    And I click on "Fixture link" "link" in the "region-main" "region"
-    When I expand all fieldsets
-    Then the field "Name" matches value "Important information"
-    Then the field "Other" matches value "Other information"
+    Given I log in as "admin"
+    And I visit "/lib/tests/fixtures/readonlyform.php?sections=2"
+    When I press "Expand all"
+    Then "Name" "field" should be visible
+    And the field "Name" matches value "Important information"
+    And "Other" "field" should be visible
+    And the field "Other" matches value "Other information"
+    And I press "Collapse all"
+    And "Name" "field" should not be visible
+    And "Other" "field" should not be visible