ALLY-12: Fix behat tests for 4.3

anthology-ally · Aug 7, 2024 · f57bc51 · f57bc51
1 parent adfe069
commit f57bc51
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/amd/build/main.min.js b/amd/build/main.min.js
diff --git a/amd/build/main.min.js.map b/amd/build/main.min.js.map
diff --git a/amd/src/main.js b/amd/src/main.js
@@ -434,17 +434,26 @@ function($, Templates, Strings, Ally, ImageCover, Util) {
          * @param {string} module
          * @param {array} additionalSelectors
          */
-        var annotateModuleIntros = function(introMapping, module, additionalSelectors) {
-            for (var i in introMapping) {
-                var annotation = introMapping[i];
-                var selectors = [
+        const annotateModuleIntros = function(introMapping, module, additionalSelectors) {
+            for (const i in introMapping) {
+                const annotation = introMapping[i];
+
+                // Description selector for when activity modules show a description on the course page.
+                // We need to be specific here for non course pages to skip this.
+                const descriptionSelector = self.config.moodleversion >= 2023100900 ?
+                    // Selector for Moodle 4.3+
+                    'li.activity.modtype_' + module + '#module-' + i + ' .activity-description .no-overflow > .no-overflow' :
+                    // Selector for < Moodle 4.3
+                    'li.activity.modtype_' + module + '#module-' + i + ' .description .no-overflow > .no-overflow';
+
+                const selectors = [
                     'body.path-mod-' + module + '.cmid-' + i + ' #intro > .no-overflow',
-                    // We need to be specific here for non course pages to skip this.
-                    'li.activity.modtype_' + module + '#module-' + i + ' .description .no-overflow > .no-overflow',
+                    descriptionSelector,
                     'li.snap-activity.modtype_' + module + '#module-' + i + ' .contentafterlink > .no-overflow'
                 ];
+
                 if (additionalSelectors) {
-                    for (var a in additionalSelectors) {
+                    for (const a in additionalSelectors) {
                         selectors.push(additionalSelectors[a].replace('{{i}}', i));
                     }
                 }

diff --git a/filter.php b/filter.php
@@ -553,7 +553,8 @@ public function setup($page, $context) {
             $configvars = (object) [
                 'adminurl' => !empty($config->adminurl) ? $config->adminurl : null,
                 'pushurl' => !empty($config->pushurl) ? $config->pushurl : null,
-                'clientid' => !empty($config->clientid) ? $config->clientid : null
+                'clientid' => !empty($config->clientid) ? $config->clientid : null,
+                'moodleversion' => $CFG->version
             ];
 
             $params = new stdClass();