Moodle release 3.9.22

This commit makes the following improvements to mod_imscp tests:
* Removes unnecessary @javascript and @_file_upload tags from non-JS tests.
* Removes user/enrol data generation from tests that can be performed as admin.
* Removes "I log out" and other unnecessary steps.

.github/workflows/push.yml

@@ -64,7 +64,7 @@ jobs:
     steps:
       - name: Setting up DB mysql
         if: ${{ matrix.db == 'mysqli' }}
-        uses: johanmeiring/mysql-action@tmpfs-patch
+        uses: moodlehq/mysql-action@v1
         with:
           collation server: utf8mb4_bin
           mysql version: 5.7
@@ -72,6 +72,8 @@ jobs:
           mysql user: test
           mysql password: test
           use tmpfs: true
+          tmpfs size: '1024M'
+          extra conf: --skip-log-bin
 
       - name: Setting up DB pgsql
         if: ${{ matrix.db == 'pgsql' }}

.travis.yml

@@ -81,7 +81,8 @@ install:
             sudo service mysql stop
             sudo mv /var/lib/mysql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/mysql /var/lib/mysql
-            sudo service mysql restart
+            echo -e "[mysqld]\nskip-log-bin" | sudo tee -a /etc/mysql/my.cnf
+            sudo service mysql start
         fi
     - >
         if [ "$DB" = 'pgsql' ];
@@ -92,6 +93,7 @@ install:
             sudo mv /var/lib/postgresql /mnt/ramdisk
             sudo ln -s /mnt/ramdisk/postgresql /var/lib/postgresql
             sudo service postgresql start 9.6
+            sh -c 'until pg_isready -p 5432; do echo "Waiting for the DB to be up..."; sleep 2; done'
         fi
     - >
         if [ "$TASK" = 'PHPUNIT' ];

Gruntfile.js

@@ -142,7 +142,7 @@ module.exports = function(grunt) {
     const path = require('path');
     const tasks = {};
     const async = require('async');
-    const DOMParser = require('xmldom').DOMParser;
+    const DOMParser = require('@xmldom/xmldom').DOMParser;
     const xpath = require('xpath');
     const semver = require('semver');
     const watchman = require('fb-watchman');
@@ -229,8 +229,8 @@ module.exports = function(grunt) {
      * @return {String} The rewritten destination path.
      */
     var babelRename = function(destPath, srcPath) {
-        destPath = srcPath.replace('src', 'build');
-        destPath = destPath.replace('.js', '.min.js');
+        destPath = srcPath.replace(`amd/src`, `amd/build`);
+        destPath = destPath.replace(/\.js$/, '.min.js');
         return destPath;
     };
 

TRADEMARK.txt

@@ -1,48 +1,66 @@
 MOODLE TRADEMARKS POLICY
 ========================
 
-The word "Moodle" is trademarked in many countries around the world. The word
-was originally coined as an acronym: Modular Object-Oriented Dynamic Learning
-Environment. The trademark is owned by Martin Dougiamas, Founder and Director
-of Moodle.
+The Moodle Trademark
+--------------------
 
-The law obligates trademark owners to police their marks and prevent the use of
-confusingly similar names by third parties. Through this policy we’d like to
-make it clear how Moodle-related projects, organisations, and people can use
-the Moodle trademark. We’d also like to be clear about how use of the word is
-restricted when used to promote commercial Moodle services. We do this to
-protect the very business model that allows us to continue developing Moodle
-for you.
+The brand and word "Moodle" has trade mark protection in many countries around
+the world. Various Moodle™ trade marks are owned by either Moodle Pty Ltd or
+one of its associated entities. The law obligates trade mark owners to police
+their trade marks and prevent the use of confusingly similar names by
+third parties.
 
-Allowed uses
-------------
+We have created a more concise and thorough set of Trademark Guidelines
+(https://moodle.com/wp-content/uploads/2023/02/Moodle-Trademark-Guidelines-2023-4.pdf)
+to help you understand how to comply with Moodle's trade mark requirements.
+The Trademark Guidelines will also assist our Moodle Certified Partners and the
+community to understand some of the principles that inform Moodle's stance
+whenever potential infringement has been detected by us or our community.
 
-The following uses don’t require any permission at all:
+We need to be clear about use of the word "Moodle" and how we restrict its use
+when promoting commercial Moodle™ branded services. The proper use of
+trade marks reliably assures consumers about the quality of the associated
+products or services and where they have been derived from. Because the
+Moodle LMS is made available under the open source ‘GNU General Public License'
+that permits you to modify the copyrighted software, the distribution of such
+modified software in combination with Moodle trade marks can potentially
+mislead others in the community. To be clear, the GNU GPL does not include an
+implied right or licence to use Moodle's trade marks.
 
-* Referring to the software or the Moodle project.
-* Describing your own Moodle implementation (including within corporate
-  settings).
+We do all this to protect the very business model that allows us to continue
+developing various Moodle software solutions for you.
+
+Allowed uses of "Moodle"
+------------------------
+
+The following uses don't require any permission at all:
+
+* Referring to the software or the Moodle project as the "Moodle™ software"
+  or the "Moodle™ project"
+* Describing your own implementation of the Moodle™ software platform
+  (including within corporate settings).
 * Describing a Moodle-based community hub.
-* Describing some software you’ve made that integrates with Moodle
-  (eg a Moodle integration feature on another system).
+* Describing certain software you've made that integrates with Moodle™
+  branded software (e.g. a Moodle™ integration feature on another system).
 
-Restricted uses
----------------
+Restricted uses of "Moodle"
+---------------------------
 
 The following uses are generally prohibited without explicit and direct
 permission being granted to you by Moodle Pty Ltd. We do this to protect the
-Moodle project from software and sites which could confuse people. Please
-contact us to ask for permission in writing.
+Moodle™ project from software and sites which could confuse people. If in
+doubt, reach out for clarification at <trademarks@moodle.com>
 
-* You can’t use "Moodle" in the name of your software (including Mobile apps)
-* You can’t use "Moodle" in your company name
-* You can’t use "Moodle" in your domain name
-* You can’t use "Moodle" in advertising-related keywords (such as Adsense)
-* You can’t use "Moodle" to describe services around Moodle (such as hosting,
-  training, support, consulting, course creation services, theme development,
-  customisation, installation, integration and certification). This applies
-  even if you do not charge for the services. Note that usually only Moodle
-  Partners have this permission.
-
-For information about the Moodle Partner Certification Mark as well as for how
-to contact us, please see <https://moodle.com/trademarks/>.
+* You can't use the word "Moodle" or any Moodle logos for commercial purposes
+  without prior written permission from Moodle HQ.
+* You can't use "Moodle" in the name of your software (including Mobile apps).
+* You can't use "Moodle" in your company name.
+* You can't use "Moodle" in your domain name.
+* You can't use "Moodle" in advertising-related keywords (such as Adsense).
+* You can't use "Moodle" to describe services around Moodle
+  (such as hosting, training, support, consulting, course creation services,
+  theme development, customisation, installation, integration, analytics
+  and certification) that cause consumers to be confused that you are
+  associated with Moodle HQ if you are not.
+  This applies even if you do not charge for the services.
+  Note that usually only Moodle Partners have this permission.

admin/environment.xml

@@ -3751,6 +3751,7 @@
       <VENDOR name="oracle" version="19" />
     </DATABASE>
     <PHP version="7.4.0" level="required">
+      <RESTRICT function="restrict_php_version_82" message="unsupportedphpversion82" />
     </PHP>
     <PCREUNICODE level="optional">
       <FEEDBACK>
@@ -3924,4 +3925,193 @@
       </CUSTOM_CHECK>
     </CUSTOM_CHECKS>
   </MOODLE>
+  <MOODLE version="4.2" requires="3.11.8">
+    <UNICODE level="required">
+      <FEEDBACK>
+        <ON_ERROR message="unicoderequired" />
+      </FEEDBACK>
+    </UNICODE>
+    <DATABASE level="required">
+      <VENDOR name="mariadb" version="10.6.7" />
+      <VENDOR name="mysql" version="8.0" />
+      <VENDOR name="postgres" version="13" />
+      <VENDOR name="mssql" version="14.0" />
+      <VENDOR name="oracle" version="19" />
+    </DATABASE>
+    <PHP version="8.0.0" level="required">
+    </PHP>
+    <PCREUNICODE level="optional">
+      <FEEDBACK>
+        <ON_CHECK message="pcreunicodewarning" />
+      </FEEDBACK>
+    </PCREUNICODE>
+    <PHP_EXTENSIONS>
+      <PHP_EXTENSION name="iconv" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="iconvrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="mbstring" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="mbstringrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="curl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="curlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="openssl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="opensslrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="tokenizer" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="tokenizerrecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="soap" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="soaprecommended" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="ctype" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ctyperequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zip" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="ziprequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="zlib" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="gd" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="gdrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="simplexml" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="simplexmlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="spl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="splrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="pcre" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="dom" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xml" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="xmlreader" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="intl" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="intlrequired" />
+        </FEEDBACK>
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="json" level="required">
+      </PHP_EXTENSION>
+      <PHP_EXTENSION name="hash" level="required"/>
+      <PHP_EXTENSION name="fileinfo" level="required"/>
+      <PHP_EXTENSION name="sodium" level="required"/>
+      <PHP_EXTENSION name="exif" level="optional"/>
+    </PHP_EXTENSIONS>
+    <PHP_SETTINGS>
+      <PHP_SETTING name="memory_limit" value="96M" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="settingmemorylimit" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="file_uploads" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="settingfileuploads" />
+        </FEEDBACK>
+      </PHP_SETTING>
+      <PHP_SETTING name="opcache.enable" value="1" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="opcacherecommended" />
+        </FEEDBACK>
+      </PHP_SETTING>
+    </PHP_SETTINGS>
+    <CUSTOM_CHECKS>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_storage_engine" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbstorageengine" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="question/engine/upgrade/upgradelib.php" function="quiz_attempts_upgraded" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="quizattemptsupgradedmessage" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_slasharguments" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="slashargumentswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_database_tables_row_format" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unsupporteddbtablerowformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_unoconv_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="unoconvwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_libcurl_version" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="libcurlwarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_format" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfileformat" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_file_per_table" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddbfilepertable" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_large_prefix" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="unsupporteddblargeprefix" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_is_https" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="ishttpswarning" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mysql_incomplete_unicode_support" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="incompleteunicodesupport" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_sixtyfour_bits" level="required">
+        <FEEDBACK>
+          <ON_ERROR message="sixtyfourbitsrequired" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_max_input_vars" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_admin_dir_usage" level="optional">
+        <FEEDBACK>
+          <ON_CHECK message="iscustomadminwarnings" />
+        </FEEDBACK>
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_xmlrpc_usage" level="optional">
+      </CUSTOM_CHECK>
+      <CUSTOM_CHECK file="lib/upgradelib.php" function="check_mod_assignment" level="required">
+      </CUSTOM_CHECK>
+    </CUSTOM_CHECKS>
+  </MOODLE>
 </COMPATIBILITY_MATRIX>

admin/mnet/access_control.php

@@ -6,7 +6,7 @@ require_once(__DIR__ . '/../../config.php');
 require_once($CFG->libdir.'/adminlib.php');
 include_once($CFG->dirroot.'/mnet/lib.php');
 
-$sort         = optional_param('sort', 'username', PARAM_ALPHA);
+$sort         = optional_param('sort', 'username', PARAM_ALPHAEXT);
 $dir          = optional_param('dir', 'ASC', PARAM_ALPHA);
 $page         = optional_param('page', 0, PARAM_INT);
 $perpage      = optional_param('perpage', 30, PARAM_INT);
@@ -153,7 +153,15 @@ foreach ($columns as $column) {
     $headings[$column] = "<a href=\"?sort=$column&amp;dir=$columndir&amp;\">".$string[$column]."</a>$columnicon";
 }
 $headings['delete'] = '';
-$acl = $DB->get_records('mnet_sso_access_control', null, "$sort $dir", '*'); //, $page * $perpage, $perpage);
+
+$sortorder = get_safe_orderby([
+    'username' => 'username',
+    'mnet_host_id' => 'mnet_host_id',
+    'access' => 'accessctrl',
+    'default' => 'username',
+], $sort, $dir, false);
+
+$acl = $DB->get_records('mnet_sso_access_control', null, $sortorder);
 $aclcount = $DB->count_records('mnet_sso_access_control');
 
 if (!$acl) {

admin/tool/behat/tests/behat/get_and_set_fields.feature

@@ -30,10 +30,9 @@ Feature: Verify that all form fields values can be get and set
       | student2 | G2 |
       | student3 | G2 |
     And the following "activities" exist:
-      | activity | course | idnumber | name | intro | firstpagetitle | wikimode | visible |
-      | wiki | C1 | wiki1 | Test this one | Test this one | Test this one | collaborative | 0 |
-    And I log in as "admin"
-    And I am on "Course 1" course homepage
+      | activity | course | idnumber | name          | firstpagetitle | wikimode      | visible |
+      | wiki     | C1     | wiki1    | Test this one | Test this one  | collaborative | 0       |
+    And I am on the "Course 1" course page logged in as admin
     And I navigate to "Reset" in current page administration
     # Select (multi-select) - Checking "the select box should contain".
     And I expand all fieldsets
@@ -61,16 +60,14 @@ Feature: Verify that all form fields values can be get and set
     # Checkbox - Checking "I set the field" and "The field matches value" ticked.
     And I set the field "Force format" to "1"
     And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
     And I expand all fieldsets
     And the field "Force format" matches value "1"
     And the field "Force format" does not match value ""
     # Checkbox - Checking "I set the field" and "The field matches value" unticked.
     And I set the field "Force format" to ""
     And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
     And I expand all fieldsets
     And the field "Force format" matches value ""
     And the field "Force format" does not match value "1"
@@ -78,8 +75,7 @@ Feature: Verify that all form fields values can be get and set
     And I set the following fields to these values:
       | Force format | 1 |
     And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
     And I expand all fieldsets
     And the following fields match these values:
       | Force format | 1 |
@@ -89,8 +85,7 @@ Feature: Verify that all form fields values can be get and set
     And I set the following fields to these values:
       | Force format | |
     And I press "Save and return to course"
-    And I am on the "Test this one" "wiki activity" page
-    And I navigate to "Edit settings" in current page administration
+    And I am on the "Test this one" "wiki activity editing" page
     And I expand all fieldsets
     And the following fields match these values:
       | Force format | |
@@ -136,12 +131,13 @@ Feature: Verify that all form fields values can be get and set
     And I navigate to "Edit settings" in current page administration
     And the field "Course ID number" matches value "Course id number"
 
-  Scenario: with JS disabled all form fields getters and setters works as expected
-
   @javascript
   Scenario: with JS enabled all form fields getters and setters works as expected
-    Then I am on "Course 1" course homepage
-    And I navigate to "Users > Groups" in current page administration
+    Given the following "activities" exist:
+      | activity | course | name        |
+      | lesson   | C1     | Test lesson |
+    When I am on "Course 1" course homepage
+    Then I navigate to "Users > Groups" in current page administration
     # Select (multi-select & AJAX) - Checking "I set the field" and "select box should contain".
     And I set the field "groups" to "Group 2"
     And the "members" select box should contain "Student 2 (s2@example.com)"
@@ -152,11 +148,8 @@ Feature: Verify that all form fields values can be get and set
     And the "members" select box should contain "Student 2 (s2@example.com)"
     And the "members" select box should not contain "Student 3 (s3@example.com)"
     # Checkbox (AJAX) - Checking "I set the field" and "I set the following fields to these values".
-    And I am on "Course 1" course homepage
-    And I add a "Lesson" to section "1"
+    And I am on the "Test lesson" "lesson activity editing" page
     And I set the following fields to these values:
-      | Name | Test lesson |
-      | Description | Test lesson description |
       | available[enabled] | 1 |
     And I set the field "deadline[enabled]" to "1"
     # Checkbox (AJAX) - Checking "the field matches value" before saving.

admin/tool/licensemanager/tests/behat/license_manager.feature

@@ -33,3 +33,27 @@ Feature: Licence manager
     And "This is the site default licence" "icon" should exist in the "cc" "table_row"
     And "Enable licence" "icon" should not exist in the "cc" "table_row"
     And "This is the site default licence" "icon" should not exist in the "public" "table_row"
+
+  @javascript @_file_upload
+  Scenario Outline: User licence preference is remembered depending of setting value
+    Given the following config values are set as admin:
+      | sitedefaultlicense      | cc                        |
+      | rememberuserlicensepref | <rememberuserlicensepref> |
+    And I log in as "admin"
+    And I follow "Manage private files..."
+    And I follow "Add..."
+    And I follow "Upload a file"
+    And the field with xpath "//select[@name='license']" matches value "Creative Commons"
+    And I click on "Close" "button" in the "File picker" "dialogue"
+    When I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager as:
+      | Save as | empty_copy.txt |
+      | license | Public domain |
+    And I press "Save changes"
+    And I follow "Manage private files..."
+    And I follow "Add..."
+    Then the field with xpath "//select[@name='license']" matches value "<expectedlicence>"
+
+    Examples:
+      | rememberuserlicensepref | expectedlicence  |
+      | 0                       | Creative Commons |
+      | 1                       | Public domain    |

admin/tool/log/store/database/tests/store_test.php

@@ -32,8 +32,7 @@ class logstore_database_store_testcase extends advanced_testcase {
      * Tests log writing.
      *
      * @param bool $jsonformat True to test with JSON format
-     * @dataProvider test_log_writing_provider
-     * @throws moodle_exception
+     * @dataProvider log_writing_provider
      */
     public function test_log_writing(bool $jsonformat) {
         global $DB, $CFG;
@@ -251,9 +250,9 @@ class logstore_database_store_testcase extends advanced_testcase {
      * Returns different JSON format settings so the test can be run with JSON format either on or
      * off.
      *
-     * @return [bool] Array of true/false
+     * @return bool[] Array of true/false
      */
-    public static function test_log_writing_provider(): array {
+    public static function log_writing_provider(): array {
         return [
             [false],
             [true]
@@ -310,17 +309,16 @@ class logstore_database_store_testcase extends advanced_testcase {
         $logmanager = get_log_manager();
         $allreports = \core_component::get_plugin_list('report');
 
-        $supportedreports = array(
-            'report_log' => '/report/log',
-            'report_loglive' => '/report/loglive'
-        );
-
         // Make sure all supported reports are installed.
-        $expectedreports = array_keys(array_intersect_key($allreports, $supportedreports));
-        $reports = $logmanager->get_supported_reports('logstore_database');
-        $reports = array_keys($reports);
+        $expectedreports = array_intersect_key([
+            'log' => 'report_log',
+            'loglive' => 'report_loglive',
+        ], $allreports);
+
+        $supportedreports = $logmanager->get_supported_reports('logstore_database');
+
         foreach ($expectedreports as $expectedreport) {
-            $this->assertContains($expectedreport, $reports);
+            $this->assertArrayHasKey($expectedreport, $supportedreports);
         }
     }
 }

admin/tool/log/store/legacy/tests/store_test.php

@@ -257,20 +257,19 @@ class logstore_legacy_store_testcase extends advanced_testcase {
         $logmanager = get_log_manager();
         $allreports = \core_component::get_plugin_list('report');
 
-        $supportedreports = array(
-            'report_log' => '/report/log',
-            'report_loglive' => '/report/loglive',
-            'report_outline' => '/report/outline',
-            'report_participation' => '/report/participation',
-            'report_stats' => '/report/stats'
-        );
-
         // Make sure all supported reports are installed.
-        $expectedreports = array_keys(array_intersect_key($allreports, $supportedreports));
-        $reports = $logmanager->get_supported_reports('logstore_legacy');
-        $reports = array_keys($reports);
+        $expectedreports = array_intersect_key([
+            'log' => 'report_log',
+            'loglive' => 'report_loglive',
+            'outline' => 'report_outline',
+            'participation' => 'report_participation',
+            'stats' => 'report_stats'
+        ], $allreports);
+
+        $supportedreports = $logmanager->get_supported_reports('logstore_legacy');
+
         foreach ($expectedreports as $expectedreport) {
-            $this->assertContains($expectedreport, $reports);
+            $this->assertArrayHasKey($expectedreport, $supportedreports);
         }
     }
 

admin/tool/log/store/standard/tests/store_test.php

@@ -37,8 +37,7 @@ class logstore_standard_store_testcase extends advanced_testcase {
      * Tests log writing.
      *
      * @param bool $jsonformat True to test with JSON format
-     * @dataProvider test_log_writing_provider
-     * @throws moodle_exception
+     * @dataProvider log_writing_provider
      */
     public function test_log_writing(bool $jsonformat) {
         global $DB;
@@ -222,9 +221,9 @@ class logstore_standard_store_testcase extends advanced_testcase {
      * Returns different JSON format settings so the test can be run with JSON format either on or
      * off.
      *
-     * @return [bool] Array of true/false
+     * @return bool[] Array of true/false
      */
-    public static function test_log_writing_provider(): array {
+    public static function log_writing_provider(): array {
         return [
             [false],
             [true]
@@ -238,20 +237,19 @@ class logstore_standard_store_testcase extends advanced_testcase {
         $logmanager = get_log_manager();
         $allreports = \core_component::get_plugin_list('report');
 
-        $supportedreports = array(
-            'report_log' => '/report/log',
-            'report_loglive' => '/report/loglive',
-            'report_outline' => '/report/outline',
-            'report_participation' => '/report/participation',
-            'report_stats' => '/report/stats'
-        );
-
         // Make sure all supported reports are installed.
-        $expectedreports = array_keys(array_intersect_key($allreports, $supportedreports));
-        $reports = $logmanager->get_supported_reports('logstore_standard');
-        $reports = array_keys($reports);
+        $expectedreports = array_intersect_key([
+            'log' => 'report_log',
+            'loglive' => 'report_loglive',
+            'outline' => 'report_outline',
+            'participation' => 'report_participation',
+            'stats' => 'report_stats'
+        ], $allreports);
+
+        $supportedreports = $logmanager->get_supported_reports('logstore_standard');
+
         foreach ($expectedreports as $expectedreport) {
-            $this->assertContains($expectedreport, $reports);
+            $this->assertArrayHasKey($expectedreport, $supportedreports);
         }
     }
 
@@ -367,7 +365,7 @@ class logstore_standard_store_testcase extends advanced_testcase {
      * Tests the decode_other function can cope with both JSON and PHP serialized format.
      *
      * @param mixed $value Value to encode and decode
-     * @dataProvider test_decode_other_provider
+     * @dataProvider decode_other_provider
      */
     public function test_decode_other($value) {
         $this->assertEquals($value, \logstore_standard\log\store::decode_other(serialize($value)));
@@ -386,7 +384,7 @@ class logstore_standard_store_testcase extends advanced_testcase {
      *
      * @return array Array of parameters
      */
-    public function test_decode_other_provider(): array {
+    public function decode_other_provider(): array {
         return [
             [['info' => 'd2819896', 'logurl' => 'discuss.php?d=2819896']],
             [null],
@@ -399,8 +397,7 @@ class logstore_standard_store_testcase extends advanced_testcase {
      * Checks that backup and restore of log data works correctly.
      *
      * @param bool $jsonformat True to test with JSON format
-     * @dataProvider test_log_writing_provider
-     * @throws moodle_exception
+     * @dataProvider log_writing_provider
      */
     public function test_backup_restore(bool $jsonformat) {
         global $DB;

admin/tool/lp/tests/behat/framework_crud.feature

@@ -128,3 +128,18 @@ Feature: Manage competency frameworks
     Then I should see "Competency framework updated"
     And I should see "Science Year-6 Edited"
     And I should see "sc-y-6"
+
+  Scenario: Duplicate a competency framework
+    Given the following lp "frameworks" exist:
+      | shortname | idnumber |
+      | CF1       | CF1      |
+    And the following lp "competencies" exist:
+      | shortname | framework |
+      | C1        | CF1       |
+    And I navigate to "Competencies > Competency frameworks" in site administration
+    # Duplicate the selected competency framework
+    When I click on "Duplicate" of edit menu in the "CF1" row
+    # Confirm that the selected framework was duplicated by clicking on the link
+    And I click on "CF1 (copy) (CF1_1)" "link"
+    # Confirm that the corresponding competency also exists in the duplicated framework
+    Then I should see "C1"

admin/tool/lp/tests/behat/plan_workflow.feature

@@ -144,9 +144,7 @@ Feature: Manage plan workflow
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 |
       | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 |
-    And I log in as "manager1"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page logged in as "manager1"
     And I follow "Learning plans"
     And I should see "List of learning plans"
     And I follow "Learning plans"
@@ -163,9 +161,7 @@ Feature: Manage plan workflow
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | active | manager1 |
       | Test-Plan4 | user1 | Description of plan 4 for user 1 | active | manager1 |
-    And I log in as "manager1"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page logged in as "manager1"
     And I follow "Learning plans"
     And I should see "List of learning plans"
     And I follow "Learning plans"
@@ -185,9 +181,7 @@ Feature: Manage plan workflow
       | name | user | description | status | reviewer |
       | Test-Plan3 | user1 | Description of plan 3 for user 1 | complete | manager1 |
       | Test-Plan4 | user1 | Description of plan 4 for user 1 | complete | manager1 |
-    And I log in as "manager1"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page logged in as "manager1"
     And I follow "Learning plans"
     And I should see "List of learning plans"
     And I follow "Learning plans"

admin/tool/mobile/tests/api_test.php

@@ -69,22 +69,28 @@ class tool_mobile_api_testcase extends externallib_advanced_testcase {
      */
     public function test_get_potential_config_issues() {
         global $CFG;
-        require_once($CFG->dirroot . '/message/lib.php');
 
         $this->resetAfterTest(true);
         $this->setAdminUser();
 
+        // Set non-SSL wwwroot, to avoid spurious certificate checking.
+        $CFG->wwwroot = 'http://www.example.com';
         $CFG->userquota = '73289234723498234723423489273423497234234';
         $CFG->debugdisplay = 1;
+
         set_config('debugauthdb', 1, 'auth_db');
         set_config('debugdb', 1, 'enrol_database');
-        $expectedissues = array('nohttpsformobilewarning', 'invaliduserquotawarning', 'adodbdebugwarning', 'displayerrorswarning');
 
+        // Get potential issues, obtain their keys for comparison.
         $issues = api::get_potential_config_issues();
-        $this->assertCount(count($expectedissues), $issues);
-        foreach ($issues as $issue) {
-            $this->assertTrue(in_array($issue[0], $expectedissues));
-        }
+        $issuekeys = array_column($issues, 0);
+
+        $this->assertEqualsCanonicalizing([
+            'nohttpsformobilewarning',
+            'invaliduserquotawarning',
+            'adodbdebugwarning',
+            'displayerrorswarning',
+        ], $issuekeys);
     }
 
     /**

admin/tool/policy/tests/behat/acceptances.feature

@@ -241,9 +241,7 @@ Feature: Viewing acceptances reports and accepting on behalf of other users
     And I set the field "I agree to the This site policy" to "1"
     And I press "Next"
     And I log out
-    And I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "Manager"
+    And I am on the "manager" "user > profile" page logged in as "admin"
     And I follow "Log in as"
     And I press "Continue"
     And I navigate to "Users > Privacy and policies > Manage policies" in site administration

admin/tool/policy/tests/behat/consent.feature

@@ -562,9 +562,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
     And the following "users" exist:
       | username | firstname | lastname | email            |
       | user1    | User      | 1        | user1@example.com    |
-    When I log in as "admin"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    When I am on the "user1" "user > profile" page logged in as "admin"
     And I follow "Log in as"
     Then I should see "You are logged in as User 1"
     And I press "Continue"
@@ -603,8 +601,7 @@ Feature: User must accept policy managed by this plugin when logging in and sign
     And I set the field "I agree to the This site policy" to "1"
     And I set the field "I agree to the This privacy policy" to "1"
     And I press "Next"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I follow "User 1"
+    And I am on the "user1" "user > profile" page
     And I follow "Log in as"
     Then I should see "You are logged in as User 1"
     And I press "Continue"

availability/condition/completion/tests/condition_test.php

@@ -386,7 +386,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
     /**
      * Tests the is_available and get_description functions for previous activity option.
      *
-     * @dataProvider test_previous_activity_data
+     * @dataProvider previous_activity_data
      * @param int $grade the current assign grade (0 for none)
      * @param int $condition true for complete, false for incomplete
      * @param string $mark activity to mark as complete
@@ -475,7 +475,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
         $this->assertRegExp($description, $information);
     }
 
-    public function test_previous_activity_data(): array {
+    public function previous_activity_data(): array {
         // Assign grade, condition, activity to complete, activity to test, result, resultnot, description.
         return [
             'Missing previous activity complete' => [
@@ -567,7 +567,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
      * Tests the is_available and get_description functions for
      * previous activity option in course sections.
      *
-     * @dataProvider test_section_previous_activity_data
+     * @dataProvider section_previous_activity_data
      * @param int $condition condition value
      * @param bool $mark if Page 1 must be mark as completed
      * @param string $section section to add the availability
@@ -640,7 +640,7 @@ class availability_completion_condition_testcase extends advanced_testcase {
 
     }
 
-    public function test_section_previous_activity_data(): array {
+    public function section_previous_activity_data(): array {
         return [
             // Condition, Activity completion, section to test, result, resultnot, description.
             'Completion complete Section with no previous activity' => [

availability/condition/profile/classes/condition.php

@@ -197,7 +197,12 @@ class condition extends \core_availability\condition {
                         $this->customfield);
             }
         } else {
-            $translatedfieldname = get_user_field_name($this->standardfield);
+            $standardfields = self::get_standard_profile_fields();
+            if (array_key_exists($this->standardfield, $standardfields)) {
+                $translatedfieldname = $standardfields[$this->standardfield];
+            } else {
+                $translatedfieldname = get_string('missing', 'availability_profile', $this->standardfield);
+            }
         }
         $context = \context_course::instance($course->id);
         $a = new \stdClass();
@@ -321,6 +326,33 @@ class condition extends \core_availability\condition {
         return $fieldconditionmet;
     }
 
+    /**
+     * Return list of standard user profile fields used by the condition
+     *
+     * @return string[]
+     */
+    public static function get_standard_profile_fields(): array {
+        return [
+            'firstname' => get_user_field_name('firstname'),
+            'lastname' => get_user_field_name('lastname'),
+            'email' => get_user_field_name('email'),
+            'city' => get_user_field_name('city'),
+            'country' => get_user_field_name('country'),
+            'url' => get_user_field_name('url'),
+            'icq' => get_user_field_name('icq'),
+            'skype' => get_user_field_name('skype'),
+            'aim' => get_user_field_name('aim'),
+            'yahoo' => get_user_field_name('yahoo'),
+            'msn' => get_user_field_name('msn'),
+            'idnumber' => get_user_field_name('idnumber'),
+            'institution' => get_user_field_name('institution'),
+            'department' => get_user_field_name('department'),
+            'phone1' => get_user_field_name('phone1'),
+            'phone2' => get_user_field_name('phone2'),
+            'address' => get_user_field_name('address')
+        ];
+    }
+
     /**
      * Gets data about custom profile fields. Cached statically in current
      * request.
@@ -472,6 +504,11 @@ class condition extends \core_availability\condition {
             $valuefield = 'data';
             $default = $customfield->defaultdata;
         } else {
+            $standardfields = self::get_standard_profile_fields();
+            if (!array_key_exists($this->standardfield, $standardfields)) {
+                // If the field isn't found, nobody matches.
+                return [];
+            }
             $values = $DB->get_records_select('user', 'id ' . $sql, $params,
                     '', 'id, '. $this->standardfield);
             $valuefield = $this->standardfield;
@@ -595,6 +632,11 @@ class condition extends \core_availability\condition {
                 $where = "(ud.data IS NOT NULL AND $condition)";
             }
         } else {
+            $standardfields = self::get_standard_profile_fields();
+            if (!array_key_exists($this->standardfield, $standardfields)) {
+                // If the field isn't found, nobody matches.
+                return ['SELECT id FROM {user} WHERE 0 = 1', []];
+            }
             $tablesql = "JOIN {user} u ON u.id = userids.id";
             list ($where, $mainparams) = $this->get_condition_sql(
                     'u.' . $this->standardfield);

availability/condition/profile/classes/frontend.php

@@ -42,26 +42,9 @@ class frontend extends \core_availability\frontend {
 
     protected function get_javascript_init_params($course, \cm_info $cm = null,
             \section_info $section = null) {
+
         // Standard user fields.
-        $standardfields = array(
-            'firstname' => get_user_field_name('firstname'),
-            'lastname' => get_user_field_name('lastname'),
-            'email' => get_user_field_name('email'),
-            'city' => get_user_field_name('city'),
-            'country' => get_user_field_name('country'),
-            'url' => get_user_field_name('url'),
-            'icq' => get_user_field_name('icq'),
-            'skype' => get_user_field_name('skype'),
-            'aim' => get_user_field_name('aim'),
-            'yahoo' => get_user_field_name('yahoo'),
-            'msn' => get_user_field_name('msn'),
-            'idnumber' => get_user_field_name('idnumber'),
-            'institution' => get_user_field_name('institution'),
-            'department' => get_user_field_name('department'),
-            'phone1' => get_user_field_name('phone1'),
-            'phone2' => get_user_field_name('phone2'),
-            'address' => get_user_field_name('address')
-        );
+        $standardfields = condition::get_standard_profile_fields();
         \core_collator::asort($standardfields);
 
         // Custom fields.

availability/condition/profile/lang/en/availability_profile.php

@@ -39,7 +39,7 @@ $string['requires_notendswith'] = 'Your <strong>{$a->field}</strong> does not en
 $string['requires_notisequalto'] = 'Your <strong>{$a->field}</strong> is not <strong>{$a->value}</strong>';
 $string['requires_notstartswith'] = 'Your <strong>{$a->field}</strong> does not start with <strong>{$a->value}</strong>';
 $string['requires_startswith'] = 'Your <strong>{$a->field}</strong> starts with <strong>{$a->value}</strong>';
-$string['missing'] = '(Missing custom field: {$a})';
+$string['missing'] = '(Missing field: {$a})';
 $string['title'] = 'User profile';
 $string['op_contains'] = 'contains';
 $string['op_doesnotcontain'] = 'doesn\'t contain';

blocks/myoverview/tests/behat/block_myoverview_pagination.feature

@@ -146,6 +146,7 @@ Feature: My overview block pagination
       | student1 | C12 | student |
       | student1 | C13 | student |
     When I log in as "student1"
+    And I wait until ".block_myoverview [data-control='next']" "css_element" exists
     And I click on "[data-control='next']" "css_element" in the "Course overview" "block"
     Then the "class" attribute of ".block_myoverview [data-control='next']" "css_element" should contain "disabled"
     And I log out

blocks/tests/behat/manage_blocks.feature

@@ -17,17 +17,11 @@ Feature: Block appearances
     And the following "activities" exist:
       | activity | course | name             | element |
       | survey   | C1     | Test survey name | 4       |
-
-    And I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Book" to section "1" and I fill the form with:
-      | Name | Test book name |
-      | Description | Test book description |
-    And I follow "Test book name"
-    And I set the following fields to these values:
-      | Chapter title | Book title |
-      | Content       | Book content test test |
-    And I press "Save changes"
+      | book     | C1     | Test book name   |         |
+    And the following "mod_book > chapter" exists:
+      | book    | Test book name         |
+      | title   | Book title             |
+      | content | Book content test test |
     And I am on the "Course 1" course page logged in as teacher1
     And I turn editing mode on
     And I add the "Comments" block

blocks/tests/behat/move_blocks.feature

@@ -17,17 +17,11 @@ Feature: Block region moving
     And the following "activities" exist:
       | activity | name             | course | template |
       | survey   | Test survey name | C1     | 4        |
-    And I log in as "admin"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Book" to section "1" and I fill the form with:
-      | Name | Test book name |
-      | Description | Test book description |
-    And I follow "Test book name"
-    And I set the following fields to these values:
-      | Chapter title | Book title |
-      | Content       | Book content test test |
-    And I press "Save changes"
-    And I log out
+      | book     | Test book name   | C1     |          |
+    And the following "mod_book > chapter" exists:
+      | book    | Test book name         |
+      | title   | Book title             |
+      | content | Book content test test |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
     And I add the "Comments" block

calendar/tests/externallib_test.php

@@ -2628,7 +2628,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
      *
      * @return array
      */
-    public function test_get_calendar_event_by_id_prevent_read_other_users_events_data_provider(): array {
+    public function get_calendar_event_by_id_prevent_read_other_users_events_data_provider(): array {
         $syscontext = context_system::instance();
         $managerrole = 'manager';
         return [
@@ -2643,7 +2643,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
      * Prevent user from reading other user's event.
      *
      * @covers \core_calendar_external::get_calendar_event_by_id
-     * @dataProvider test_get_calendar_event_by_id_prevent_read_other_users_events_data_provider
+     * @dataProvider get_calendar_event_by_id_prevent_read_other_users_events_data_provider
      *
      * @param bool          $isadminevent      Is admin's event
      * @param bool          $isadmin           Is current user admin user
@@ -2699,7 +2699,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
      *
      * @return array
      */
-    public function test_edit_or_delete_other_users_events_data_provider(): array {
+    public function edit_or_delete_other_users_events_data_provider(): array {
         $syscontext = context_system::instance();
         $managerrole = 'manager';
         return [
@@ -2713,7 +2713,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
     /**
      * Test the behavior of deleting other users' user events.
      *
-     * @dataProvider test_edit_or_delete_other_users_events_data_provider
+     * @dataProvider edit_or_delete_other_users_events_data_provider
      * @covers \core_calendar_external::delete_calendar_events
      * @param bool          $isadmin Whether the current user is admin.
      * @param bool          $isadminevent Whether it's an admin event or not.
@@ -2760,7 +2760,7 @@ class core_calendar_externallib_testcase extends externallib_advanced_testcase {
     /**
      * Test the behavior of editing other users' user events
      *
-     * @dataProvider test_edit_or_delete_other_users_events_data_provider
+     * @dataProvider edit_or_delete_other_users_events_data_provider
      * @covers \core_calendar_external::submit_create_update_form
      * @param bool          $isadmin Whether the current user is admin.
      * @param bool          $isadminevent Whether it's an admin event or not.

calendar/tests/std_proxy_test.php

@@ -56,7 +56,7 @@ class core_calendar_std_proxy_testcase extends advanced_testcase {
     /**
      * Test proxying.
      *
-     * @dataProvider test_proxy_testcases()
+     * @dataProvider proxy_testcases
      * @param int    $id       Object ID.
      * @param string $member   Object member to retrieve.
      * @param mixed  $expected Expected value of member.
@@ -72,7 +72,7 @@ class core_calendar_std_proxy_testcase extends advanced_testcase {
     /**
      * Test setting values with a base class.
      *
-     * @dataProvider test_proxy_testcases()
+     * @dataProvider proxy_testcases
      * @param int    $id          Object ID.
      * @param string $member      Object member to retrieve.
      * @param mixed  $storedvalue Value as would be stored externally.
@@ -93,7 +93,7 @@ class core_calendar_std_proxy_testcase extends advanced_testcase {
     /**
      * Test getting a non existant member.
      *
-     * @dataProvider test_get_set_testcases()
+     * @dataProvider get_set_testcases
      * @param int $id ID of the object being proxied.
      */
     public function test_get_invalid_member($id) {
@@ -108,7 +108,7 @@ class core_calendar_std_proxy_testcase extends advanced_testcase {
     /**
      * Test get proxied instance.
      *
-     * @dataProvider test_get_set_testcases()
+     * @dataProvider get_set_testcases
      * @param int $id Object ID.
      */
     public function test_get_proxied_instance($id) {
@@ -122,7 +122,7 @@ class core_calendar_std_proxy_testcase extends advanced_testcase {
     /**
      * Test cases for proxying test.
      */
-    public function test_proxy_testcases() {
+    public function proxy_testcases() {
         return [
             'Object 1 member 1' => [
                 1,
@@ -160,7 +160,7 @@ class core_calendar_std_proxy_testcase extends advanced_testcase {
     /**
      * Test cases for getting and setting tests.
      */
-    public function test_get_set_testcases() {
+    public function get_set_testcases() {
         return [
             'Object 1' => [1],
             'Object 2' => [5]

config-dist.php

@@ -70,6 +70,10 @@ $CFG->dboptions = array(
                                 // can be removed for MySQL (by default it will
                                 // use 'utf8mb4_unicode_ci'. This option should
                                 // be removed for all other databases.
+    // 'extrainfo' => [],       // Extra information for the DB driver, e.g. SQL Server,
+                                // has additional configuration according to its environment,
+                                // which the administrator can specify to alter and
+                                // override any connection options.
     // 'fetchbuffersize' => 100000, // On PostgreSQL, this option sets a limit
                                 // on the number of rows that are fetched into
                                 // memory when doing a large recordset query

course/format/topics/tests/behat/edit_delete_sections.feature

@@ -14,7 +14,7 @@ Feature: Sections can be edited and deleted in topics format
     And the following "activities" exist:
       | activity   | name                   | intro                         | course | idnumber    | section |
       | assign     | Test assignment name   | Test assignment description   | C1     | assign1     | 0       |
-      | book       | Test book name         | Test book description         | C1     | book1       | 1       |
+      | book       | Test book name         |                               | C1     | book1       | 1       |
       | chat       | Test chat name         | Test chat description         | C1     | chat1       | 4       |
       | choice     | Test choice name       | Test choice description       | C1     | choice1     | 5       |
     And the following "course enrolments" exist:

course/format/weeks/tests/behat/edit_delete_sections.feature

@@ -14,7 +14,7 @@ Feature: Sections can be edited and deleted in weeks format
     And the following "activities" exist:
       | activity   | name                   | intro                         | course | idnumber    | section |
       | assign     | Test assignment name   | Test assignment description   | C1     | assign1     | 0       |
-      | book       | Test book name         | Test book description         | C1     | book1       | 1       |
+      | book       | Test book name         |                               | C1     | book1       | 1       |
       | chat       | Test chat name         | Test chat description         | C1     | chat1       | 4       |
       | choice     | Test choice name       | Test choice description       | C1     | choice1     | 5       |
     And the following "course enrolments" exist:

course/tests/behat/course_format.feature

@@ -0,0 +1,80 @@
+@core @core_course
+Feature: Teacher can change the course format
+  In order to change course format
+  As a teacher
+  I should be able to edit a course
+
+  @javascript
+  Scenario: Teacher can change the course format
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+    # Course format is initially set to Topics format
+    And the following "courses" exist:
+      | fullname | shortname | format | startdate       |
+      | Course 1 | C1        | topics | ## 1 day ago ## |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+    # Confirm that course format is Topics
+    When I am on the "Course 1" course page logged in as teacher1
+    Then I should see "Topic 1"
+    And I am on the "Course 1" "course editing" page
+    And I expand all fieldsets
+    # Fields that appear for Topics format exist
+    # Also confirm contents of Hidden sections and Course layout select box
+    And I should see "Hidden sections"
+    And the "Hidden sections" select box should contain "Hidden sections are shown in collapsed form"
+    And the "Hidden sections" select box should contain "Hidden sections are completely invisible"
+    # Hidden sections default value is 0 (Hidden sections are shown in collapsed form)
+    And the field "Hidden sections" matches value "0"
+    And I should see "Course layout"
+    And the "Course layout" select box should contain "Show all sections on one page"
+    And the "Course layout" select box should contain "Show one section per page"
+    # Course layout default value is 0 (Show all sections on one page)
+    And the field "Course layout" matches value "0"
+    # Set course format to Single activity format
+    And I set the field "Format" to "Single activity format"
+    And I expand all fieldsets
+    # Confirm that fields that appear for Single activity format appears
+    And I should see "Type of activity"
+    And I set the field "Type of activity" to "Glossary"
+    And I press "Save and display"
+    And I set the field "Name" to "Glossary 1"
+    And I press "Save and display"
+    # Confirm that course page displays single activity of type Glossary
+    And I should see "Browse the glossary using this index"
+    And I should not see "Topic 1"
+    And I am on the "Course 1" "course editing" page
+    And I expand all fieldsets
+    # Set course format to Weekly format
+    And I set the field "Format" to "Weekly format"
+    And I expand all fieldsets
+    # Confirm that fields that appear for Weekly format appears
+    # Also confirm contents of Hidden sections and Course layout select box
+    And I should see "Hidden sections"
+    And the "Hidden sections" select box should contain "Hidden sections are shown in collapsed form"
+    And the "Hidden sections" select box should contain "Hidden sections are completely invisible"
+    # Hidden sections default value is 0 (Hidden sections are shown in collapsed form)
+    And the field "Hidden sections" matches value "0"
+    And I should see "Course layout"
+    And the "Course layout" select box should contain "Show all sections on one page"
+    And the "Course layout" select box should contain "Show one section per page"
+    # Course layout default value is 0 (Show all sections on one page)
+    And the field "Course layout" matches value "0"
+    And I press "Save and display"
+    # Confirm that course page displays weekly sections
+    And I should see "This week"
+    And I should not see "Browse the glossary using this index"
+    And I am on the "Course 1" "course editing" page
+    And I expand all fieldsets
+    # Set course format to Social format
+    And I set the field "Format" to "Social format"
+    # Confirm that fields that appear for Social format appears
+    And I expand all fieldsets
+    And I should see "Number of discussions"
+    And the field "Number of discussions" matches value "10"
+    And I press "Save and display"
+    # Confirm that course page displays a forum
+    And I should see "There are no discussion topics yet in this forum"
+    And I should not see "This week"

enrol/cohort/tests/behat/enrolcohorts.feature

@@ -0,0 +1,81 @@
+@enrol @enrol_cohort
+Feature: Cohort enrolment management
+
+  Background:
+    Given the following "users" exist:
+      | username    | firstname | lastname | email                   |
+      | teacher001  | Teacher   | 001      | teacher001@example.com  |
+      | s1          | Sandra    | Cole     | s1@example.com          |
+      | s2          | John      | Smith    | s2@example.com          |
+      | s4          | Jane      | Doe      | s4@example.com          |
+      | s3          | Bianca    | McAfee   | s3@example.com          |
+      | s5          | Abigail   | Wyatt    | s5@example.com          |
+    And the following "cohorts" exist:
+      | name         | idnumber | visible | Context       |
+      | Alpha1       | A1       | 1       | 3 |
+      | Beta2        | B1       | 1       | 3 |
+    And the following "courses" exist:
+      | fullname   | shortname | format | startdate       |
+      | Course 001 | C001      | weeks  | ##1 month ago## |
+    And the following "course enrolments" exist:
+      | user       | course | role           | timestart       |
+      | teacher001 | C001   | editingteacher | ##1 month ago## |
+    And the following "cohort members" exist:
+      | user | cohort |
+      | s1   | A1     |
+      | s2   | A1     |
+      | s3   | B1     |
+      | s5   | B1     |
+    And I am on the "Course 001" course page logged in as teacher001
+
+  @javascript
+  Scenario: Add groups in the course cohort enrolment
+    When I add "Cohort sync" enrolment method with:
+      | Cohort      | A1 |
+      | customint2  | -1 |
+    Then I should see "Cohort sync (Alpha1 - Student)"
+    And I am on "Course 001" course homepage
+    And I navigate to "Users > Groups" in current page administration
+    # Confirm that group was created and corresponding group members are present
+    And I set the field "groups[]" to "Alpha1 cohort (2)"
+    And the "members" select box should contain "Sandra Cole (s1@example.com)"
+    And the "members" select box should contain "John Smith (s2@example.com)"
+    And I log in as "admin"
+    And I navigate to "Users > Accounts > Cohorts" in site administration
+    And I click on "Assign" "link" in the "Alpha1" "table_row"
+    And I should see "Cohort 'Alpha1' members"
+    And I should see "Removing users from a cohort may result in unenrolling of users from multiple courses which includes deleting of user settings, grades, group membership and other user information from affected courses."
+    # Remove user s4 from cohort
+    And I set the field "removeselect[]" to "John Smith (s2@example.com)"
+    And I click on "Remove" "button"
+    # Add user s4 to the cohort.
+    And I set the field "addselect_searchtext" to "s4"
+    And I set the field "addselect[]" to "Jane Doe (s4@example.com)"
+    And I click on "Add" "button"
+    And the "removeselect[]" select box should contain "Sandra Cole (s1@example.com)"
+    And the "removeselect[]" select box should contain "Jane Doe (s4@example.com)"
+    And the "removeselect[]" select box should not contain "John Smith (s2@example.com)"
+    And I trigger cron
+    And I am on "Course 001" course homepage
+    And I navigate to course participants
+    # Verifies students 1 and 4 are in the cohort and student 2 is not any more.
+    And the following should exist in the "participants" table:
+      | First name / Last name | Email address  | Roles   | Groups        |
+      | Sandra Cole            | s1@example.com | Student | Alpha1 cohort |
+      | Jane Doe               | s4@example.com | Student | Alpha1 cohort |
+    And the following should not exist in the "participants" table:
+      | First name / Last name | Email address  | Roles   | Groups        |
+      | John Smith             | s2@example.com | Student | Alpha1 cohort |
+
+  @javascript
+  Scenario: Course cohort enrolment creates a new group
+    When I add "Cohort sync" enrolment method with:
+      | Cohort      | B1 |
+    And I click on "Edit" "link" in the "Beta2" "table_row"
+    And I set the field "Add to group" to "Create new group"
+    And I click on "Save changes" "button"
+    And I am on "Course 001" course homepage
+    And I navigate to "Users > Groups" in current page administration
+    And I set the field "groups[]" to "Beta2 cohort (2)"
+    Then the "members" select box should contain "Bianca McAfee (s3@example.com)"
+    And the "members" select box should contain "Abigail Wyatt (s5@example.com)"

files/tests/behat/add_custom_file_type.feature

@@ -26,9 +26,8 @@ Feature: Add a new custom file type
       | Custom description | Moodle rules |
     And I press "Save changes"
     And I should see "application/x-moodle-rules"
-    And I log out
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
+    And I am on the "Course 1" course page logged in as teacher1
+    And I turn editing mode on
     When I add a "File" to section "1" and I fill the form with:
       | Name | Test file |
       | Select files | files/tests/fixtures/custom_filetype.mdlr |

filter/algebra/filter.php

@@ -237,7 +237,7 @@ class filter_algebra extends moodle_text_filter {
                   $DB->insert_record("cache_filters", $texcache, false);
                   $text = str_replace( $matches[0][$i], filter_algebra_image($filename, $texexp, '', '', $align), $text);
                } else {
-                  $text = str_replace( $matches[0][$i],"<b>Undetermined error:</b> ",$text);
+                  $text = str_replace( $matches[0][$i],"<b>Undetermined error:</b> " . $matches[0][$i], $text);
                }
             } else {
                $text = str_replace( $matches[0][$i], filter_algebra_image($filename, $texcache->rawtext), $text);

filter/data/filter.php

@@ -123,7 +123,7 @@ class filter_data extends moodle_text_filter {
             usort($contents, 'filter_data::sort_entries_by_length');
 
             foreach ($contents as $content) {
-                $href_tag_begin = '<a class="data autolink dataid'.$content->dataid.'" title="'.$content->content.'" '.
+                $href_tag_begin = '<a class="data autolink dataid'.$content->dataid.'" title="'.s($content->content).'" '.
                                   'href="'.$CFG->wwwroot.'/mod/data/view.php?d='.$content->dataid.
                                   '&amp;rid='.$content->recordid.'">';
                 $contentlist[] = new filterobject($content->content, $href_tag_begin, '</a>', false, true);

filter/displayh5p/tests/behat/h5p_filter.feature

@@ -69,6 +69,7 @@ Feature: Render H5P content using filters
     And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
     And I wait until the page is ready
     When I click on "Save and display" "button"
+    And I should see "PageName1" in the "page-header" "region"
 #   Switch to iframe created by filter
     And I switch to "h5p-iframe" class iframe
 #   Switch to iframe created by embed.php page
@@ -104,6 +105,7 @@ Feature: Render H5P content using filters
     And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
     And I wait until the page is ready
     When I click on "Save and display" "button"
+    And I should see "PageName1" in the "page-header" "region"
 #   Switch to iframe created by filter
     And I switch to "h5p-iframe" class iframe
     Then I should see "Note that the libraries may exist in the file you uploaded, but you're not allowed to upload new libraries."
@@ -129,6 +131,7 @@ Feature: Render H5P content using filters
     And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
     And I wait until the page is ready
     And I click on "Save and display" "button"
+    And I should see "PageName1" in the "page-header" "region"
 #   Switch to iframe created by filter
     And I switch to "h5p-iframe" class iframe
 #   Libraries don't exist, so an error should be displayed.
@@ -152,6 +155,7 @@ Feature: Render H5P content using filters
     And I click on "Insert H5P" "button" in the "Insert H5P" "dialogue"
     And I wait until the page is ready
     And I click on "Save and display" "button"
+    And I should see "PageName2" in the "page-header" "region"
 #   Switch to iframe created by filter
     And I switch to "h5p-iframe" class iframe
 #   Switch to iframe created by embed.php page

filter/mathjaxloader/tests/filter_test.php

@@ -14,15 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Provides the {@link filter_mathjaxloader_filter_testcase} class.
- *
- * @package     filter_mathjaxloader
- * @category    test
- * @copyright   2017 David Mudrák <david@moodle.com>
- * @license     http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 defined('MOODLE_INTERNAL') || die();
 
 global $CFG;
@@ -31,6 +22,8 @@ require_once($CFG->dirroot.'/filter/mathjaxloader/filter.php');
 /**
  * Unit tests for the MathJax loader filter.
  *
+ * @package   filter_mathjaxloader
+ * @category  test
  * @copyright 2017 David Mudrak <david@moodle.com>
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
@@ -42,7 +35,7 @@ class filter_mathjaxloader_filter_testcase extends advanced_testcase {
      * @param string $moodlelangcode the user's current language
      * @param string $mathjaxlangcode the mathjax language to be used for the moodle language
      *
-     * @dataProvider test_map_language_code_expected_mappings
+     * @dataProvider map_language_code_expected_mappings
      */
     public function test_map_language_code($moodlelangcode, $mathjaxlangcode) {
 
@@ -55,7 +48,7 @@ class filter_mathjaxloader_filter_testcase extends advanced_testcase {
      *
      * @return array of [moodlelangcode, mathjaxcode] tuples
      */
-    public function test_map_language_code_expected_mappings() {
+    public function map_language_code_expected_mappings() {
 
         return [
             ['cz', 'cs'], // Explicit mapping.

filter/mathjaxloader/tests/filtermath_test.php

@@ -38,7 +38,7 @@ class filter_mathjaxloader_filtermath_testcase extends advanced_testcase {
      * @param string $inputtext The text given by the user.
      * @param string $expected The expected output after filtering.
      *
-     * @dataProvider test_math_filtering_inputs
+     * @dataProvider math_filtering_inputs
      */
     public function test_math_filtering($inputtext, $expected) {
         $filter = new filter_mathjaxloader(context_system::instance(), []);
@@ -50,7 +50,7 @@ class filter_mathjaxloader_filtermath_testcase extends advanced_testcase {
      *
      * @return array of [inputtext, expectedoutput] tuples.
      */
-    public function test_math_filtering_inputs() {
+    public function math_filtering_inputs() {
         return [
             // One inline formula.
             ['Some inline math \\( y = x^2 \\).',

filter/tex/lib.php

@@ -70,7 +70,8 @@ function filter_tex_sanitize_formula($texexp) {
         '\lowercase','\relax','\aftergroup',
         '\afterassignment','\expandafter','\noexpand','\special',
         '\let', '\futurelet','\else','\fi','\chardef','\makeatletter','\afterground',
-        '\noexpand','\line','\mathcode','\item','\section','\mbox','\declarerobustcommand'
+        '\noexpand','\line','\mathcode','\item','\section','\mbox','\declarerobustcommand',
+        '\ExplSyntaxOn',
     ];
 
     $allowlist = ['inputenc'];

grade/report/grader/tests/behat/switch_views.feature

@@ -43,24 +43,24 @@ Feature: We can change what we are viewing on the grader report
     And I click on "Hide" "link" in the "Test assignment name 2" activity
     And I am on "Course 1" course homepage
     And I navigate to "View > Grader report" in the course gradebook
-    And I should see "Test assignment name 1"
-    And I should see "Test assignment name 2"
+    And I should see "Test assignment name 1" in the "user-grades" "table"
+    And I should see "Test assignment name 2" in the "user-grades" "table"
     And I should see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
       | -1-                | -4-       | -5-       | -6-       | -7-       |
       | Student 1          | 80        | 90        | 30        | 170       |
     And I click on "Change to aggregates only" "link"
-    And I should not see "Test assignment name 1"
-    And I should not see "Test assignment name 2"
+    And I should not see "Test assignment name 1" in the "user-grades" "table"
+    And I should not see "Test assignment name 2" in the "user-grades" "table"
     And I should not see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
       | -1-                | -4-       |
       | Student 1          | 170       |
     And I click on "Change to grades only" "link"
-    And I should see "Test assignment name 1"
-    And I should see "Test assignment name 2"
+    And I should see "Test assignment name 1" in the "user-grades" "table"
+    And I should see "Test assignment name 2" in the "user-grades" "table"
     And I should see "Manual grade"
     And I should not see "Course total"
     And the following should exist in the "user-grades" table:
@@ -68,7 +68,7 @@ Feature: We can change what we are viewing on the grader report
       | Student 1          | 80        | 90        | 30        |
 
   @javascript @skip_chrome_zerosize
-  Scenario: View and minimise the grader report containing hidden activities without the 'moodle/grade:viewhidden' capability
+  Scenario: Minimise the grader report containing hidden activities without the 'moodle/grade:viewhidden' capability
     When I am on "Course 1" course homepage with editing mode on
     And I open "Test assignment name 2" actions menu
     And I click on "Hide" "link" in the "Test assignment name 2" activity
@@ -81,24 +81,24 @@ Feature: We can change what we are viewing on the grader report
     And I log in as "teacher1"
     And I am on "Course 1" course homepage
     And I navigate to "View > Grader report" in the course gradebook
-    And I should see "Test assignment name 1"
-    And I should see "Test assignment name 2"
+    And I should see "Test assignment name 1" in the "user-grades" "table"
+    And I should see "Test assignment name 2" in the "user-grades" "table"
     And I should see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
       | -1-                | -4-       | -5-       | -6-       | -7-       |
       | Student 1          | 80        | -         | 30        | 105.71    |
     And I click on "Change to aggregates only" "link"
-    And I should not see "Test assignment name 1"
-    And I should not see "Test assignment name 2"
+    And I should not see "Test assignment name 1" in the "user-grades" "table"
+    And I should not see "Test assignment name 2" in the "user-grades" "table"
     And I should not see "Manual grade"
     And I should see "Course total"
     And the following should exist in the "user-grades" table:
       | -1-                | -4-       |
       | Student 1          | 105.71    |
     And I click on "Change to grades only" "link"
-    And I should see "Test assignment name 1"
-    And I should see "Test assignment name 2"
+    And I should see "Test assignment name 1" in the "user-grades" "table"
+    And I should see "Test assignment name 2" in the "user-grades" "table"
     And I should see "Manual grade"
     And I should not see "Course total"
     And the following should exist in the "user-grades" table:

grade/report/history/classes/output/tablelog.php

@@ -27,6 +27,7 @@ namespace gradereport_history\output;
 defined('MOODLE_INTERNAL') || die;
 
 require_once($CFG->libdir . '/tablelib.php');
+require_once($CFG->dirroot . '/user/lib.php');
 
 /**
  * Renderable class for gradehistory report.
@@ -53,6 +54,11 @@ class tablelog extends \table_sql implements \renderable {
      */
     protected $filters;
 
+    /**
+     * @var \stdClass[] List of users included in the report (if userids are specified as filters)
+     */
+    protected $users = [];
+
     /**
      * @var array A list of grade items present in the course.
      */
@@ -99,7 +105,6 @@ class tablelog extends \table_sql implements \renderable {
         $this->courseid = $this->context->instanceid;
         $this->pagesize = $perpage;
         $this->page = $page;
-        $this->filters = (object)$filters;
         $this->gradeitems = \grade_item::fetch_all(array('courseid' => $this->courseid));
         $this->cms = get_fast_modinfo($this->courseid);
         $this->useridfield = 'userid';
@@ -108,6 +113,9 @@ class tablelog extends \table_sql implements \renderable {
         // Define columns in the table.
         $this->define_table_columns();
 
+        // Define filters.
+        $this->define_table_filters((object) $filters);
+
         // Define configs.
         $this->define_table_configs($url);
 
@@ -136,6 +144,36 @@ class tablelog extends \table_sql implements \renderable {
         $this->no_sorting('grader');
     }
 
+    /**
+     * Define table filters
+     *
+     * @param \stdClass $filters
+     */
+    protected function define_table_filters(\stdClass $filters): void {
+        global $DB;
+
+        $this->filters = $filters;
+
+        if (!empty($this->filters->userids)) {
+
+            $course = get_course($this->courseid);
+
+            // Retrieve userids that are part of the filters object, and ensure user can access each of them.
+            [$userselect, $userparams] = $DB->get_in_or_equal(explode(',', $this->filters->userids), SQL_PARAMS_NAMED);
+            [$usersort] = users_order_by_sql();
+
+            $this->users = array_filter(
+                $DB->get_records_select('user', "id {$userselect}", $userparams, $usersort),
+                static function(\stdClass $user) use ($course): bool {
+                    return user_can_view_profile($user, $course);
+                }
+            );
+
+            // Reset userids to the filtered array of users.
+            $this->filters->userids = implode(',', array_keys($this->users));
+        }
+    }
+
     /**
      * Setup the headers for the html table.
      */
@@ -507,19 +545,9 @@ class tablelog extends \table_sql implements \renderable {
     /**
      * Returns a list of selected users.
      *
-     * @return array returns an array in the format $userid => $userid
+     * @return \stdClass[] List of user objects
      */
-    public function get_selected_users() {
-        global $DB;
-        $idlist = array();
-        if (!empty($this->filters->userids)) {
-
-            $idlist = explode(',', $this->filters->userids);
-            list($where, $params) = $DB->get_in_or_equal($idlist);
-            return $DB->get_records_select('user', "id $where", $params);
-
-        }
-        return $idlist;
+    public function get_selected_users(): array {
+        return $this->users;
     }
-
 }

grade/report/history/tests/report_test.php

@@ -60,6 +60,9 @@ class gradereport_history_report_testcase extends advanced_testcase {
         self::getDataGenerator()->enrol_user($u4->id, $c1->id, 'student');
         self::getDataGenerator()->enrol_user($u5->id, $c1->id, 'student');
 
+        self::getDataGenerator()->enrol_user($grader1->id, $c2->id, 'teacher');
+        self::getDataGenerator()->enrol_user($u5->id, $c2->id, 'student');
+
         // Modules.
         $c1m1 = $this->getDataGenerator()->create_module('assign', array('course' => $c1));
         $c1m2 = $this->getDataGenerator()->create_module('assign', array('course' => $c1));
@@ -132,11 +135,18 @@ class gradereport_history_report_testcase extends advanced_testcase {
         $this->assertEquals(8, $this->get_tablelog_results($c1ctx, array(), true));
         $this->assertEquals(13, $this->get_tablelog_results($c2ctx, array(), true));
 
-        // Filtering on 1 user.
-        $this->assertEquals(3, $this->get_tablelog_results($c1ctx, array('userids' => $u1->id), true));
+        // Filtering on 1 user the current user cannot access should return all records.
+        $this->assertEquals(8, $this->get_tablelog_results($c1ctx, array('userids' => $u1->id), true));
 
-        // Filtering on more users.
-        $this->assertEquals(4, $this->get_tablelog_results($c1ctx, array('userids' => "$u1->id,$u3->id"), true));
+        // Filtering on 2 users, only one of whom the current user can access.
+        $this->assertEquals(1, $this->get_tablelog_results($c1ctx, ['userids' => "$u1->id,$u3->id"], true));
+        $results = $this->get_tablelog_results($c1ctx, ['userids' => "$u1->id,$u3->id"]);
+        $this->assertGradeHistoryIds([$grades['c1m1u3']->id], $results);
+
+        // Filtering on 2 users, both of whom the current user can access.
+        $this->assertEquals(3, $this->get_tablelog_results($c1ctx, ['userids' => "$u2->id,$u3->id"], true));
+        $results = $this->get_tablelog_results($c1ctx, ['userids' => "$u2->id,$u3->id"]);
+        $this->assertGradeHistoryIds([$grades['c1m1u2']->id, $grades['c1m1u3']->id, $grades['c1m2u2']->id], $results);
 
         // Filtering based on one grade item.
         $gi = grade_item::fetch($giparams + array('iteminstance' => $c1m1->id));

grade/tests/behat/grade_aggregation.feature

@@ -421,6 +421,8 @@ Feature: We can use calculated grade totals
       | Extra credit  | 0   |
       | Maximum grade | 200 |
       | Rescale existing grades | No |
+    # Change window size to ultra-wide to avoid 'out-of-bounds' random failures.
+    And I change window size to "5120x2160"
     And I give the grade "21.00" to the user "Student 1" for the grade item "Manual item 2"
     And I press "Save changes"
     And I give the grade "20.00" to the user "Student 1" for the grade item "Manual item 2"
@@ -432,6 +434,8 @@ Feature: We can use calculated grade totals
       | Extra credit  | 0   |
       | Maximum grade | 100 |
       | Rescale existing grades | No |
+    # Change window size to ultra-wide to avoid 'out-of-bounds' random failures.
+    And I change window size to "5120x2160"
     And I give the grade "21.00" to the user "Student 1" for the grade item "Manual item 2"
     And I press "Save changes"
     And I give the grade "20.00" to the user "Student 1" for the grade item "Manual item 2"

grade/tests/behat/grade_to_pass.feature

@@ -21,10 +21,8 @@ Feature: We can set the grade to pass value
     And the following "activity" exists:
       | activity                            | assign                  |
       | course                              | C1                      |
-      | section                             | 1                       |
       | idnumber                            | assign1                 |
       | name                                | Test Assignment 1       |
-      | intro                               | Submit your online text |
       | assignsubmission_onlinetext_enabled | 1                       |
     And I am on the "Course 1" course page logged in as teacher1
 
@@ -179,14 +177,9 @@ Feature: We can set the grade to pass value
 
   Scenario: Set a valid grade to pass for lesson activity
     Given the following "activities" exist:
-      | activity   | name          | intro       | course | section | idnumber  |
-      | lesson     | Test Lesson 1 | Test        | C1     | 1       | lesson1   |
-    And I am on "Course 1" course homepage with editing mode on
-    And I follow "Test Lesson 1"
-    And I navigate to "Edit settings" in current page administration
-    And I set the following fields to these values:
-      | Grade to pass | 90            |
-    And I press "Save and return to course"
+      | activity   | name          | course | idnumber  | gradepass |
+      | lesson     | Test Lesson 1 | C1     | lesson1   | 90        |
+    And I am on the "Test Lesson 1" "lesson activity" page
     And I navigate to "View > Grader report" in the course gradebook
     And I turn editing mode on
     And I click on "Edit  lesson Test Lesson 1" "link"
@@ -194,9 +187,7 @@ Feature: We can set the grade to pass value
     Then the field "Grade to pass" matches value "90"
     And I set the field "Grade to pass" to "80"
     And I press "Save changes"
-    And I am on "Course 1" course homepage
-    And I follow "Test Lesson 1"
-    And I follow "Edit settings"
+    And I am on the "Test Lesson 1" "lesson activity editing" page
     And the field "Grade to pass" matches value "80"
 
   Scenario: Set a valid grade to pass for database activity

group/tests/behat/group_description_picture.feature

@@ -1,8 +1,8 @@
 @core @core_group
-Feature: The description of a group can be viewed by students and teachers
-  In order to view the description of a group
+Feature: The description and picture of a group can be viewed by students and teachers
+  In order to view the description and picture of a group
   As a teacher
-  I need to create groups and add descriptions to them.
+  I need to create groups and add descriptions and picture to them.
 
   Background:
     Given the following "courses" exist:
@@ -19,11 +19,9 @@ Feature: The description of a group can be viewed by students and teachers
       | student1 | C1 | student |
       | student2 | C1 | student |
 
-  @javascript
-  Scenario: A student can see the group description when visible groups are set. Teachers can see group details.
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I navigate to "Edit settings" in current page administration
+  @javascript @_file_upload
+  Scenario: A student can see the group description and picture when visible groups are set. Teachers can see group details.
+    Given I am on the "Course 1" "course editing" page logged in as "teacher1"
     And I set the following fields to these values:
       | Group mode | Visible groups |
     And I press "Save and display"
@@ -32,6 +30,8 @@ Feature: The description of a group can be viewed by students and teachers
     And I set the following fields to these values:
       | Group name | Group A |
       | Group description | Description for Group A |
+    # Upload group picture
+    And I upload "lib/tests/fixtures/gd-logo.png" file to "New picture" filemanager
     And I press "Save changes"
     And I press "Create group"
     And I set the following fields to these values:
@@ -39,11 +39,12 @@ Feature: The description of a group can be viewed by students and teachers
     And I press "Save changes"
     And I add "Student 1 (student1@example.com)" user to "Group A" group members
     And I add "Student 2 (student2@example.com)" user to "Group B" group members
-    And I am on "Course 1" course homepage
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
     And I should see "Description for Group A"
+    # As teacher, confirm that group picture is displayed
+    And "//img[@class='grouppicture']" "xpath_element" should exist
     And ".groupinfobox" "css_element" should exist
     And I set the field "type" in the "Filter 1" "fieldset" to "Groups"
     And I set the field "Type or select..." in the "Filter 1" "fieldset" to "Group B"
@@ -52,27 +53,23 @@ Feature: The description of a group can be viewed by students and teachers
     And I click on "Group B" "link"
     And I should see "Student 2" in the "participants" "table"
     And ".groupinfobox" "css_element" should not exist
-    And I log out
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
+    # As student, confirm that group description and picture is displayed
     Then I should see "Description for Group A"
-    And I log out
-    And I log in as "student2"
-    And I am on "Course 1" course homepage
+    And "//img[@class='grouppicture']" "xpath_element" should exist
+    And I am on the "Course 1" course page logged in as student2
     And I navigate to course participants
     And I click on "Student 2" "link" in the "participants" "table"
     And I click on "Group B" "link"
     And I should see "Student 2" in the "participants" "table"
     And ".groupinfobox" "css_element" should not exist
 
-  @javascript
-  Scenario: A student can not see the group description when separate groups are set. Teachers can see group details.
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage
-    And I navigate to "Edit settings" in current page administration
+  @javascript @_file_upload
+  Scenario: A student can not see the group description and picture when separate groups are set. Teachers can see group details.
+    Given I am on the "Course 1" "course editing" page logged in as "teacher1"
     And I set the following fields to these values:
       | Group mode | Separate groups |
     And I press "Save and display"
@@ -81,6 +78,8 @@ Feature: The description of a group can be viewed by students and teachers
     And I set the following fields to these values:
       | Group name | Group A |
       | Group description | Description for Group A |
+    # Upload group picture
+    And I upload "lib/tests/fixtures/gd-logo.png" file to "New picture" filemanager
     And I press "Save changes"
     And I press "Create group"
     And I set the following fields to these values:
@@ -88,11 +87,12 @@ Feature: The description of a group can be viewed by students and teachers
     And I press "Save changes"
     And I add "Student 1 (student1@example.com)" user to "Group A" group members
     And I add "Student 2 (student2@example.com)" user to "Group B" group members
-    And I am on "Course 1" course homepage
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
     And I should see "Description for Group A"
+    # As teacher, confirm that group picture is displayed
+    And "//img[@class='grouppicture']" "xpath_element" should exist
     And ".groupinfobox" "css_element" should exist
     And I set the field "type" in the "Filter 1" "fieldset" to "Groups"
     And I set the field "Type or select..." in the "Filter 1" "fieldset" to "Group B"
@@ -100,18 +100,16 @@ Feature: The description of a group can be viewed by students and teachers
     And I click on "Student 2" "link" in the "participants" "table"
     And I click on "Group B" "link"
     And ".groupinfobox" "css_element" should not exist
-    And I log out
-    When I log in as "student1"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student1
     And I navigate to course participants
     And I click on "Student 1" "link" in the "participants" "table"
     And I click on "Group A" "link"
     And I should see "Student 1" in the "participants" "table"
-    And I should not see "Description for Group A"
+    # As student, confirm that group description and picture are not displayed
+    Then I should not see "Description for Group A"
+    And "//img[@class='grouppicture']" "xpath_element" should not exist
     And ".groupinfobox" "css_element" should not exist
-    And I log out
-    And I log in as "student2"
-    And I am on "Course 1" course homepage
+    When I am on the "Course 1" course page logged in as student2
     And I navigate to course participants
     And I click on "Student 2" "link" in the "participants" "table"
     And I click on "Group B" "link"

h5p/tests/framework_test.php

@@ -14,15 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Testing the H5PFrameworkInterface interface implementation.
- *
- * @package    core_h5p
- * @category   test
- * @copyright  2019 Mihail Geshoski <mihail@moodle.com>
- * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
 namespace core_h5p;
 
 use core_collator;
@@ -32,6 +23,7 @@ use core_collator;
  * Test class covering the H5PFrameworkInterface interface implementation.
  *
  * @package    core_h5p
+ * @category   test
  * @copyright  2019 Mihail Geshoski <mihail@moodle.com>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  * @runTestsInSeparateProcesses
@@ -587,7 +579,7 @@ class framework_testcase extends \advanced_testcase {
     /**
      * Test the behaviour of isPatchedLibrary().
      *
-     * @dataProvider test_isPatchedLibrary_provider
+     * @dataProvider isPatchedLibrary_provider
      * @param array $libraryrecords Array containing data for the library creation
      * @param array $testlibrary Array containing the test library data
      * @param bool $expected The expectation whether the library is patched or not
@@ -609,7 +601,7 @@ class framework_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_isPatchedLibrary_provider(): array {
+    public function isPatchedLibrary_provider(): array {
         return [
             'Unpatched library. No different versioning' => [
                 [
@@ -1365,7 +1357,7 @@ class framework_testcase extends \advanced_testcase {
     /**
      * Test the behaviour of loadLibrarySemantics().
      *
-     * @dataProvider test_loadLibrarySemantics_provider
+     * @dataProvider loadLibrarySemantics_provider
      * @param array $libraryrecords Array containing data for the library creation
      * @param array $testlibrary Array containing the test library data
      * @param string $expected The expected semantics value
@@ -1388,7 +1380,7 @@ class framework_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_loadLibrarySemantics_provider(): array {
+    public function loadLibrarySemantics_provider(): array {
 
         $semantics = json_encode(
             [
@@ -2157,7 +2149,7 @@ class framework_testcase extends \advanced_testcase {
     /**
      * Test the behaviour of test_libraryHasUpgrade().
      *
-     * @dataProvider test_libraryHasUpgrade_provider
+     * @dataProvider libraryHasUpgrade_provider
      * @param array $libraryrecords Array containing data for the library creation
      * @param array $testlibrary Array containing the test library data
      * @param bool $expected The expectation whether the library is patched or not
@@ -2179,7 +2171,7 @@ class framework_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_libraryHasUpgrade_provider(): array {
+    public function libraryHasUpgrade_provider(): array {
         return [
             'Lower major version; Identical lower version' => [
                 [

h5p/tests/generator_test.php

@@ -14,23 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
-* Test class covering the h5p data generator class.
-*
-* @package    core_h5p
-* @category   test
-* @copyright  2019 Mihail Geshoski <mihail@moodle.com>
-* @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
-*/
-
 namespace core_h5p;
 
 use core_h5p\local\library\autoloader;
 
-defined('MOODLE_INTERNAL') || die();
-
 /**
-* Generator testcase for the core_grading generator.
+* Test class covering the h5p data generator class.
 *
 * @package    core_h5p
 * @category   test
@@ -165,7 +154,7 @@ class generator_testcase extends \advanced_testcase {
      * Test the behaviour of generate_h5p_data(). Test whether library files are created or not
      * on filesystem depending what the method defines.
      *
-     * @dataProvider test_generate_h5p_data_files_creation_provider
+     * @dataProvider generate_h5p_data_files_creation_provider
      * @param bool $createlibraryfiles Whether to create library files on the filesystem
      * @param bool $expected The expectation whether the files have been created or not
      **/
@@ -205,7 +194,7 @@ class generator_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_generate_h5p_data_files_creation_provider(): array {
+    public function generate_h5p_data_files_creation_provider(): array {
         return [
             'Do not create library related files on the filesystem' => [
                 false,
@@ -256,7 +245,7 @@ class generator_testcase extends \advanced_testcase {
      * Test the behaviour of create_h5p_record(). Test whather the h5p content data is
      * properly saved in the database.
      *
-     * @dataProvider test_create_h5p_record_provider
+     * @dataProvider create_h5p_record_provider
      * @param array $h5pdata The h5p content data
      * @param \stdClass $expected The expected saved data
      **/
@@ -282,7 +271,7 @@ class generator_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_create_h5p_record_provider(): array {
+    public function create_h5p_record_provider(): array {
         $createdjsoncontent = json_encode(
             array(
                 'text' => '<p>Created dummy text<\/p>\n',
@@ -379,7 +368,7 @@ class generator_testcase extends \advanced_testcase {
      * Test the behaviour of create_contents_libraries_record(). Test whether the contents libraries
      * are properly saved in the database.
      *
-     * @dataProvider test_create_contents_libraries_record_provider
+     * @dataProvider create_contents_libraries_record_provider
      * @param array $contentslibrariestdata The h5p contents libraries data.
      * @param \stdClass $expected The expected saved data.
      **/
@@ -403,7 +392,7 @@ class generator_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_create_contents_libraries_record_provider(): array {
+    public function create_contents_libraries_record_provider(): array {
         return [
             'Create h5p content library with set dependency type' => [
                 [
@@ -439,7 +428,7 @@ class generator_testcase extends \advanced_testcase {
      * Test the behaviour of create_library_dependency_record(). Test whether the contents libraries
      * are properly saved in the database.
      *
-     * @dataProvider test_create_library_dependency_record_provider
+     * @dataProvider create_library_dependency_record_provider
      * @param array $librarydependencydata The library dependency data.
      * @param \stdClass $expected The expected saved data.
      **/
@@ -463,7 +452,7 @@ class generator_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_create_library_dependency_record_provider(): array {
+    public function create_library_dependency_record_provider(): array {
         return [
             'Create h5p library dependency with set dependency type' => [
                 [
@@ -494,7 +483,7 @@ class generator_testcase extends \advanced_testcase {
     /**
      * Test the behaviour of create_content_file(). Test whether a file belonging to a content is created.
      *
-     * @dataProvider test_create_content_file_provider
+     * @dataProvider create_content_file_provider
      * @param array $filedata Data from the file to be created.
      * @param array $expecteddata Data expected.Data from the file to be created.
      */
@@ -529,7 +518,7 @@ class generator_testcase extends \advanced_testcase {
      *
      * @return array
      **/
-    public function test_create_content_file_provider(): array {
+    public function create_content_file_provider(): array {
         return [
             'Create file in content with id 4' => [
                 [

iplookup/tests/geoplugin_test.php

@@ -31,39 +31,49 @@ defined('MOODLE_INTERNAL') || die();
  */
 class core_iplookup_geoplugin_testcase extends advanced_testcase {
 
-    public function setUp() {
+    /**
+     * Load required test libraries
+     */
+    public static function setUpBeforeClass(): void {
         global $CFG;
-        require_once("$CFG->libdir/filelib.php");
-        require_once("$CFG->dirroot/iplookup/lib.php");
+        require_once("{$CFG->dirroot}/iplookup/lib.php");
+    }
 
+    /**
+     * In order to execute this test PHPUNIT_LONGTEST should be defined as true in phpunit.xml or directly in config.php
+     */
+    public function setUp() {
         if (!PHPUNIT_LONGTEST) {
-            // we do not want to DDOS their server, right?
             $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
         }
-
-        $this->resetAfterTest();
-
-        $CFG->geoipfile = '';
     }
 
-    public function test_ipv4() {
+    /**
+     * Test IPv4 address
+     *
+     * @covers ::iplookup_find_location
+     */
+    public function test_ipv4(): void {
         $result = iplookup_find_location('50.0.184.0');
 
-        $this->assertEquals('array', gettype($result));
-        $this->assertEquals('San Francisco', $result['city']);
-        $this->assertEquals(-122.3933, $result['longitude'], 'Coordinates are out of accepted tolerance', 0.1);
-        $this->assertEquals(37.7697, $result['latitude'], 'Coordinates are out of accepted tolerance', 0.1);
+        $this->assertInternalType('array', $result);
+        $this->assertInternalType('float', $result['latitude']);
+        $this->assertInternalType('float', $result['longitude']);
+        $this->assertInternalType('string', $result['city']);
+        $this->assertInternalType('string', $result['country']);
+        $this->assertInternalType('array', $result['title']);
+        $this->assertInternalType('string', $result['title'][0]);
+        $this->assertInternalType('string', $result['title'][1]);
         $this->assertNull($result['error']);
-        $this->assertEquals('array', gettype($result['title']));
-        $this->assertEquals('San Francisco', $result['title'][0]);
-        $this->assertEquals('United States', $result['title'][1]);
     }
 
-    public function test_geoip_ipv6() {
+    /**
+     * Test IPv6 address (unsupported by Geoplugin)
+     *
+     * @covers ::iplookup_find_location
+     */
+    public function test_ipv6(): void {
         $result = iplookup_find_location('2a01:8900:2:3:8c6c:c0db:3d33:9ce6');
-
-        $this->assertNotNull($result['error']);
         $this->assertEquals($result['error'], get_string('invalidipformat', 'error'));
     }
 }
-

lang/en/admin.php

@@ -1180,6 +1180,7 @@ $string['sitepolicyhandlerplugin'] = '{$a->name} ({$a->component})';
 $string['sitepolicyguest'] = 'Site policy URL for guests';
 $string['sitepolicyguest_help'] = 'The URL of the site policy that all guests must see and agree to before accessing the site. Note that this setting will only have an effect if the site policy handler is set to default (core).';
 $string['sitesectionhelp'] = 'If selected, a topic section will be displayed on the site\'s front page.';
+$string['sixtyfourbitsrequired'] = 'It has been detected that your site is not using a 64-bit PHP version. You are required to upgrade your system (operating system, PHP...) before installing this Moodle version.';
 $string['sixtyfourbitswarning'] = 'It has been detected that your site is not using a 64-bit PHP version. It is recommended that you upgrade your site to ensure future compatibility.';
 $string['slasharguments'] = 'Use slash arguments';
 $string['slashargumentswarning'] = 'It is recommended that the use of slash arguments is enabled. In future it will be required. For more details, see the documentation <a href="https://docs.moodle.org/en/admin/environment/slasharguments">Using slash arguments</a>.';
@@ -1353,6 +1354,7 @@ $string['unsupportedphpversion73'] = 'PHP version 7.3 and higher are not support
 $string['unsupportedphpversion74'] = 'PHP version 7.4 and higher are not supported.';
 $string['unsupportedphpversion80'] = 'PHP version 8.0 and higher are not supported.';
 $string['unsupportedphpversion81'] = 'PHP version 8.1 and higher are not supported.';
+$string['unsupportedphpversion82'] = 'PHP version 8.2 and higher are not supported.';
 $string['unsuspenduser'] = 'Activate user account';
 $string['updateaccounts'] = 'Update existing accounts';
 $string['updatecomponent'] = 'Update component';
@@ -1459,7 +1461,8 @@ $string['xmlrpcmnetenabled'] = 'It has been detected that the Moodle Networking
 $string['xmlrpcwebserviceenabled'] = 'It has been detected that the XML-RPC Web Service protocol is enabled on your site. This feature relies on the PHP XML-RPC extension which is no longer maintained by PHP.';
 $string['yuicomboloading'] = 'YUI combo loading';
 $string['ziprequired'] = 'The Zip PHP extension is now required by Moodle, info-ZIP binaries or PclZip library are not used anymore.';
-
+$string['modassignmentinuse'] = 'Your site is still using the Assignment 2.2 plugin. Before upgrading you must 1) backup any Assignment 2.2 activities that you want to keep and restore them as Assignment activities, and 2) delete all Assignment 2.2 data from the database.';
+$string['modassignmentsubpluginsexist'] = 'Assignment 2.2. subplugins may be present. The mod/assignment folder and all of its subplugins need to be removed before upgrading.';
 
 $string['caching'] = 'Caching';
 $string['cachesettings'] = 'Cache settings';

lang/en/currencies.php

@@ -180,5 +180,5 @@ $string['XOF'] = 'CFA Franc BCEAO';
 $string['XPF'] = 'CFP Franc';
 $string['YER'] = 'Yemeni Rial';
 $string['ZAR'] = 'South African Rand';
-$string['ZMK'] = 'Zambian Kwacha';
+$string['ZMW'] = 'Zambian Kwacha';
 $string['ZWL'] = 'Zimbabwe Dollar';

lang/en/editor.php

@@ -53,6 +53,7 @@ $string['cutpastemozilla'] = 'Unfortunately, you cannot currently use normal key
 $string['delete'] = 'Delete';
 $string['editors'] = 'Text editors';
 $string['editorsettings'] = 'Manage editors';
+$string['editorxformat'] = '{$a} format';
 $string['enterurlfirst'] = 'You have to enter an URL first';
 $string['filebrowser'] = 'File Browser';
 $string['findwhat'] = 'Find';

lib/behat/classes/behat_config_util.php

@@ -666,7 +666,7 @@ class behat_config_util {
                 [
                     'capabilities' => [
                         'extra_capabilities' => [
-                            'chromeOptions' => [
+                            'goog:chromeOptions' => [
                                 'args' => [
                                     'unlimited-storage',
                                     'disable-web-security',
@@ -678,6 +678,16 @@ class behat_config_util {
                 $values
             );
 
+            // Selenium no longer supports non-w3c browser control.
+            // Rename chromeOptions to goog:chromeOptions, which is the W3C variant of this.
+            if (array_key_exists('chromeOptions', $values['capabilities']['extra_capabilities'])) {
+                $values['capabilities']['extra_capabilities']['goog:chromeOptions'] = array_merge_recursive(
+                    $values['capabilities']['extra_capabilities']['goog:chromeOptions'],
+                    $values['capabilities']['extra_capabilities']['chromeOptions']
+                );
+                unset($values['capabilities']['extra_capabilities']['chromeOptions']);
+            }
+
             // If the mobile app is enabled, check its version and add appropriate tags.
             if ($mobiletags = $this->get_mobile_version_tags()) {
                 if (!empty($values['tags'])) {
@@ -687,13 +697,13 @@ class behat_config_util {
                 }
             }
 
-            $values['capabilities']['extra_capabilities']['chromeOptions']['args'] = array_map(function($arg): string {
+            $values['capabilities']['extra_capabilities']['goog:chromeOptions']['args'] = array_map(function($arg): string {
                 if (substr($arg, 0, 2) === '--') {
                     return substr($arg, 2);
                 }
                 return $arg;
-            }, $values['capabilities']['extra_capabilities']['chromeOptions']['args']);
-            sort($values['capabilities']['extra_capabilities']['chromeOptions']['args']);
+            }, $values['capabilities']['extra_capabilities']['goog:chromeOptions']['args']);
+            sort($values['capabilities']['extra_capabilities']['goog:chromeOptions']['args']);
         }
 
         // Fill tags information.

lib/behat/classes/behat_session_trait.php

@@ -1676,4 +1676,30 @@ EOF;
 
         return !empty($matches);
     }
+
+    /**
+     * Get the user id from an identifier.
+     *
+     * The user username and email fields are checked.
+     *
+     * @param string $identifier The user's username or email.
+     * @return int|null The user id or null if not found.
+     */
+    protected function get_user_id_by_identifier(string $identifier): ?int {
+        global $DB;
+
+        $sql = <<<EOF
+    SELECT id
+      FROM {user}
+     WHERE username = :username
+        OR email = :email
+EOF;
+
+        $result = $DB->get_field_sql($sql, [
+            'username' => $identifier,
+            'email' => $identifier,
+        ]);
+
+        return $result ?: null;
+    }
 }

lib/behat/lib.php

@@ -138,7 +138,7 @@ function behat_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
     // set to DEVELOPER and will always include E_NOTICE,E_USER_NOTICE... as part of E_ALL, if the current
     // error_reporting() value does not include one of those levels is because it has been forced through
     // the moodle code (see fix_utf8() for example) in that cases we respect the forced error level value.
-    $respect = array(E_NOTICE, E_USER_NOTICE, E_STRICT, E_WARNING, E_USER_WARNING);
+    $respect = array(E_NOTICE, E_USER_NOTICE, E_STRICT, E_WARNING, E_USER_WARNING, E_DEPRECATED, E_USER_DEPRECATED);
     foreach ($respect as $respectable) {
 
         // If the current value does not include this kind of errors and the reported error is

lib/classes/files/curl_security_helper.php

@@ -223,7 +223,7 @@ class curl_security_helper extends curl_security_helper_base {
     protected function address_explicitly_blocked($addr) {
         $blockedhosts = $this->get_blacklisted_hosts_by_category();
         $iphostsblocked = array_merge($blockedhosts['ipv4'], $blockedhosts['ipv6']);
-        return address_in_subnet($addr, implode(',', $iphostsblocked));
+        return address_in_subnet($addr, implode(',', $iphostsblocked), true);
     }
 
     /**

lib/classes/output/mustache_pix_helper.php

@@ -68,7 +68,6 @@ class mustache_pix_helper {
         if (!$component) {
             $component = '';
         }
-        $component = $helper->render($component);
         $text = strtok("");
         // Allow mustache tags in the last argument.
         $text = trim($helper->render($text));

lib/cronlib.php

@@ -242,6 +242,10 @@ function cron_run_inner_scheduled_task(\core\task\task_base $task) {
     $predbqueries = null;
     $predbqueries = $DB->perf_get_queries();
     $pretime = microtime(1);
+
+    // Ensure that we have a clean session with the correct cron user.
+    cron_setup_user();
+
     try {
         get_mailer('buffer');
         cron_prepare_core_renderer();
@@ -325,6 +329,10 @@ function cron_run_inner_adhoc_task(\core\task\adhoc_task $task) {
         }
 
         cron_setup_user($user);
+    } else {
+        // No user specified, ensure that we have a clean session with the correct cron user.
+        cron_setup_user();
+
     }
 
     try {

lib/ddl/tests/ddl_test.php

@@ -2258,7 +2258,7 @@ class core_ddl_testcase extends database_driver_testcase {
      *
      * @return array The type-value pair fixture.
      */
-    public function test_get_enc_quoted_provider() {
+    public function get_enc_quoted_provider() {
         return array(
             // Reserved: some examples from SQL-92.
             [true, 'from'],
@@ -2272,7 +2272,7 @@ class core_ddl_testcase extends database_driver_testcase {
     /**
      * This is a test for sql_generator::getEncQuoted().
      *
-     * @dataProvider test_get_enc_quoted_provider
+     * @dataProvider get_enc_quoted_provider
      * @param bool $reserved Whether the column name is reserved or not.
      * @param string $columnname The column name to be quoted, according to the value of $reserved.
      **/
@@ -2307,7 +2307,7 @@ class core_ddl_testcase extends database_driver_testcase {
      *
      * @return array The type-old-new tuple fixture.
      */
-    public function test_sql_generator_get_rename_field_sql_provider() {
+    public function sql_generator_get_rename_field_sql_provider() {
         return array(
             // Reserved: an example from SQL-92.
             // Both names should be reserved.
@@ -2320,7 +2320,7 @@ class core_ddl_testcase extends database_driver_testcase {
     /**
      * This is a unit test for sql_generator::getRenameFieldSQL().
      *
-     * @dataProvider test_sql_generator_get_rename_field_sql_provider
+     * @dataProvider sql_generator_get_rename_field_sql_provider
      * @param bool $reserved Whether the column name is reserved or not.
      * @param string $oldcolumnname The column name to be renamed.
      * @param string $newcolumnname The new column name.

lib/dml/sqlsrv_native_moodle_database.php

@@ -208,21 +208,28 @@ class sqlsrv_native_moodle_database extends moodle_database {
 
         $this->store_settings($dbhost, $dbuser, $dbpass, $dbname, $prefix, $dboptions);
 
+        $options = [
+            'UID' => $this->dbuser,
+            'PWD' => $this->dbpass,
+            'Database' => $this->dbname,
+            'CharacterSet' => 'UTF-8',
+            'MultipleActiveResultSets' => true,
+            'ConnectionPooling' => !empty($this->dboptions['dbpersist']),
+            'ReturnDatesAsStrings' => true,
+        ];
+
         $dbhost = $this->dbhost;
         if (!empty($dboptions['dbport'])) {
             $dbhost .= ',' . $dboptions['dbport'];
         }
 
-        $this->sqlsrv = sqlsrv_connect($dbhost, array
-         (
-          'UID' => $this->dbuser,
-          'PWD' => $this->dbpass,
-          'Database' => $this->dbname,
-          'CharacterSet' => 'UTF-8',
-          'MultipleActiveResultSets' => true,
-          'ConnectionPooling' => !empty($this->dboptions['dbpersist']),
-          'ReturnDatesAsStrings' => true,
-         ));
+        // The sqlsrv_connect() has a lot of connection options to be used.
+        // Users can add any supported options with the 'extrainfo' key in the dboptions.
+        if (isset($this->dboptions['extrainfo'])) {
+            $options = array_merge($options, $this->dboptions['extrainfo']);
+        }
+
+        $this->sqlsrv = sqlsrv_connect($dbhost, $options);
 
         if ($this->sqlsrv === false) {
             $this->sqlsrv = null;

lib/editor/atto/tests/behat/autosave.feature

@@ -21,7 +21,7 @@ Feature: Atto Autosave
     And I click on "Save changes" "button"
     And I am on "Course 1" course homepage
     And I navigate to "Edit settings" in current page administration
-    And I set the field with xpath "//select[@name='summary_editor[format]']" to "1"
+    And I set the field "Course summary format" to "1"
     And I click on "Save and display" "button"
     And I log out
 

lib/environmentlib.php

@@ -1668,3 +1668,14 @@ function restrict_php_version_80($result) {
 function restrict_php_version_81($result) {
     return restrict_php_version($result, '8.1');
 }
+
+/**
+ * Check if the current PHP version is greater than or equal to
+ * PHP version 8.2
+ *
+ * @param object $result an environment_results instance
+ * @return bool result of version check
+ */
+function restrict_php_version_82($result) {
+    return restrict_php_version($result, '8.2');
+}

lib/form/editor.php

@@ -444,6 +444,7 @@ class MoodleQuickForm_editor extends HTML_QuickForm_element implements templatab
         $context['id'] = $id;
         $context['value'] = $text;
         $context['format'] = $format;
+        $context['formatlabel'] = get_string('editorxformat', 'editor', $this->_label);
 
         if (!is_null($this->getAttribute('onblur')) && !is_null($this->getAttribute('onchange'))) {
             $context['changelistener'] = true;

lib/form/templates/editor_textarea.mustache

@@ -35,6 +35,7 @@
 </div>
 <div>
     {{#hasformats}}
+        <label for="menu{{name}}format" class="sr-only">{{formatlabel}}</label>
         <select name="{{name}}[format]" id="menu{{name}}format" class="custom-select">
         {{#formats}}
             <option value="{{value}}" {{#selected}}selected{{/selected}}>{{text}}</option>

lib/moodlelib.php

@@ -9014,11 +9014,12 @@ function make_unique_id_code($extra = '') {
  *
  * @param string $addr    The address you are checking
  * @param string $subnetstr    The string of subnet addresses
+ * @param bool $checkallzeros    The state to whether check for 0.0.0.0
  * @return bool
  */
-function address_in_subnet($addr, $subnetstr) {
+function address_in_subnet($addr, $subnetstr, $checkallzeros = false) {
 
-    if ($addr == '0.0.0.0') {
+    if ($addr == '0.0.0.0' && !$checkallzeros) {
         return false;
     }
     $subnets = explode(',', $subnetstr);

lib/phpunit/classes/advanced_testcase.php

@@ -702,7 +702,7 @@ abstract class advanced_testcase extends base_testcase {
             }
 
             cron_prepare_core_renderer();
-            $this->setUser($user);
+            cron_setup_user($user);
 
             $task->execute();
             \core\task\manager::adhoc_task_complete($task);

lib/phpunit/tests/advanced_test.php

@@ -33,8 +33,13 @@ defined('MOODLE_INTERNAL') || die();
  * @category   phpunit
  * @copyright  2012 Petr Skoda {@link http://skodak.org}
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @coversDefaultClass \advanced_testcase
  */
 class core_phpunit_advanced_testcase extends advanced_testcase {
+    public static function setUpBeforeClass(): void {
+        global $CFG;
+        require_once(__DIR__ . '/fixtures/adhoc_test_task.php');
+    }
 
     public function test_debugging() {
         global $CFG;
@@ -680,4 +685,53 @@ class core_phpunit_advanced_testcase extends advanced_testcase {
         self::resetAllData(false);
         self::assertFalse(core_useragent::get_user_agent_string(), 'It should not be set again, data was reset.');
     }
+
+    /**
+     * @covers ::runAdhocTasks
+     */
+    public function test_runadhoctasks_no_tasks_queued(): void {
+        $this->runAdhocTasks();
+        $this->expectOutputRegex('/^$/');
+    }
+
+    /**
+     * @covers ::runAdhocTasks
+     */
+    public function test_runadhoctasks_tasks_queued(): void {
+        $this->resetAfterTest(true);
+        $admin = get_admin();
+        \core\task\manager::queue_adhoc_task(new \core_phpunit\adhoc_test_task());
+        $this->runAdhocTasks();
+        $this->expectOutputRegex("/Task was run as {$admin->id}/");
+    }
+
+    /**
+     * @covers ::runAdhocTasks
+     */
+    public function test_runadhoctasks_with_existing_user_change(): void {
+        $this->resetAfterTest(true);
+        $admin = get_admin();
+
+        $this->setGuestUser();
+        \core\task\manager::queue_adhoc_task(new \core_phpunit\adhoc_test_task());
+        $this->runAdhocTasks();
+        $this->expectOutputRegex("/Task was run as {$admin->id}/");
+    }
+
+    /**
+     * @covers ::runAdhocTasks
+     */
+    public function test_runadhoctasks_with_existing_user_change_and_specified(): void {
+        global $USER;
+
+        $this->resetAfterTest(true);
+        $user = $this->getDataGenerator()->create_user();
+
+        $this->setGuestUser();
+        $task = new \core_phpunit\adhoc_test_task();
+        $task->set_userid($user->id);
+        \core\task\manager::queue_adhoc_task($task);
+        $this->runAdhocTasks();
+        $this->expectOutputRegex("/Task was run as {$user->id}/");
+    }
 }

lib/phpunit/tests/fixtures/adhoc_test_task.php

@@ -0,0 +1,35 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+namespace core_phpunit;
+
+/**
+ * Fixtures for task tests.
+ *
+ * @package    core
+ * @category   phpunit
+ * @copyright  2023 Andrew Lyons <andrew@nicols.co.uk>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class adhoc_test_task extends \core\task\adhoc_task {
+    /**
+     * Execute.
+     */
+    public function execute() {
+        global $USER;
+        mtrace("Task was run as {$USER->id}");
+    }
+}

lib/sessionlib.php

@@ -170,7 +170,11 @@ function get_moodle_cookie() {
 
 /**
  * Sets up current user and course environment (lang, etc.) in cron.
- * Do not use outside of cron script!
+ * Note: This function is intended only for use in:
+ * - the cron runner scripts
+ * - individual tasks which extend the adhoc_task and scheduled_task classes
+ * - unit tests related to tasks
+ * - other parts of the cron/task system
  *
  * @param stdClass $user full user object, null means default cron user (admin),
  *                 value 'reset' means reset internal static caches.

lib/setup.php

@@ -796,6 +796,8 @@ if (empty($CFG->sessiontimeout)) {
     $CFG->sessiontimeout = 8 * 60 * 60;
 }
 \core\session\manager::start();
+// Prevent ignoresesskey hack from getting carried over to a next page.
+unset($USER->ignoresesskey);
 
 // Set default content type and encoding, developers are still required to use
 // echo $OUTPUT->header() everywhere, anything that gets set later should override these headers.

lib/tests/behat/behat_navigation.php

@@ -734,8 +734,6 @@ class behat_navigation extends behat_base {
      * @throws Exception with a meaningful error message if the specified page cannot be found.
      */
     protected function resolve_core_page_instance_url(string $type, string $identifier): moodle_url {
-        global $DB;
-
         $type = strtolower($type);
 
         switch ($type) {
@@ -819,9 +817,8 @@ class behat_navigation extends behat_base {
      * @return void
      */
     public function i_am_on_course_homepage($coursefullname) {
-        global $DB;
-        $course = $DB->get_record("course", array("fullname" => $coursefullname), 'id', MUST_EXIST);
-        $url = new moodle_url('/course/view.php', ['id' => $course->id]);
+        $courseid = $this->get_course_id($coursefullname);
+        $url = new moodle_url('/course/view.php', ['id' => $courseid]);
         $this->execute('behat_general::i_visit', [$url]);
     }
 
@@ -834,10 +831,8 @@ class behat_navigation extends behat_base {
      * @return void
      */
     public function i_am_on_course_homepage_with_editing_mode_on($coursefullname) {
-        global $DB;
-
-        $course = $DB->get_record("course", array("fullname" => $coursefullname), 'id', MUST_EXIST);
-        $url = new moodle_url('/course/view.php', ['id' => $course->id]);
+        $courseid = $this->get_course_id($coursefullname);
+        $url = new moodle_url('/course/view.php', ['id' => $courseid]);
 
         if ($this->running_javascript() && $sesskey = $this->get_sesskey()) {
             // Javascript is running so it is possible to grab the session ket and jump straight to editing mode.

lib/tests/curl_security_helper_test.php

@@ -144,6 +144,11 @@ class core_curl_security_helper_testcase extends advanced_testcase {
             // Test when DNS resolution fails.
             [[], "http://example.com", "127.0.0.1", "", true],
 
+            // Test ensures that the default value of getremoteaddr() 0.0.0.0 will check against the provided blocked list.
+            [$simpledns, "http://0.0.0.0/x.png", "0.0.0.0", "", true],
+            // Test set using IPV4 with integer format.
+            [$simpledns, "http://2852039166/x.png", "169.254.169.254", "", true],
+
             // Test some freaky deaky Unicode domains. Should be blocked always.
             [$simpledns, "http://169。254。169。254/", "127.0.0.1", "", true],
             [$simpledns, "http://169。254。169。254/", "1.2.3.4", "", true],

lib/tests/date_test.php

@@ -166,7 +166,18 @@ class core_date_testcase extends advanced_testcase {
         }
     }
 
-    public function test_timezone_lang_strings() {
+    /**
+     * We are only checking lang strings existence here, not code.
+     *
+     * @coversNothing
+     */
+    public function test_timezone_all_lang_strings() {
+        // We only run this test when PHPUNIT_LONGTEST is enabled, test_get_localised_timezone()
+        // is already checking the names of a few, hopefully stable enough to be run always.
+        if (!PHPUNIT_LONGTEST) {
+            $this->markTestSkipped('PHPUNIT_LONGTEST is not defined');
+        }
+
         $phpzones = DateTimeZone::listIdentifiers();
         $manager = get_string_manager();
         foreach ($phpzones as $tz) {
@@ -183,6 +194,12 @@ class core_date_testcase extends advanced_testcase {
         $result = core_date::get_localised_timezone('Pacific/Auckland');
         $this->assertSame('Pacific/Auckland', $result);
 
+        $result = core_date::get_localised_timezone('Europe/Madrid');
+        $this->assertSame('Europe/Madrid', $result);
+
+        $result = core_date::get_localised_timezone('America/New_York');
+        $this->assertSame('America/New_York', $result);
+
         $result = core_date::get_localised_timezone('99');
         $this->assertSame('Server timezone (Pacific/Auckland)', $result);
 

lib/tests/mustache_template_source_loader_test.php

@@ -142,7 +142,7 @@ TBC;
     /**
      * Data provider for the test_load function.
      */
-    public function test_load_test_cases() {
+    public function load_test_cases() {
         $cache = [
             'core' => [
                 'test' => '{{! a comment }}The rest of the template'
@@ -171,7 +171,7 @@ TBC;
     /**
      * Test the load function.
      *
-     * @dataProvider test_load_test_cases()
+     * @dataProvider load_test_cases
      * @param mustache_template_source_loader $loader The loader
      * @param string $component The moodle component
      * @param string $name The template name
@@ -185,7 +185,7 @@ TBC;
     /**
      * Data provider for the load_with_dependencies function.
      */
-    public function test_load_with_dependencies_test_cases() {
+    public function load_with_dependencies_test_cases() {
         // Create a bunch of templates that include one another in various ways. There is
         // multiple instances of recursive inclusions to test that the code doensn't get
         // stuck in an infinite loop.
@@ -338,7 +338,7 @@ TBC;
     /**
      * Test the load_with_dependencies function.
      *
-     * @dataProvider test_load_with_dependencies_test_cases()
+     * @dataProvider load_with_dependencies_test_cases
      * @param mustache_template_source_loader $loader The loader
      * @param string $component The moodle component
      * @param string $name The template name
@@ -352,7 +352,7 @@ TBC;
     /**
      * Data provider for the test_load function.
      */
-    public function test_scan_template_source_for_dependencies_test_cases() {
+    public function scan_template_source_for_dependencies_test_cases() {
         $foo = '{{! a comment }}{{> core/bar }}{{< test/bop }}{{/ test/bop}}{{#str}} help, core {{/str}}';
         $bar = '{{! a comment }}{{> core/baz }}';
         $baz = '{{! a comment }}{{#str}} hide, core {{/str}}';
@@ -496,7 +496,7 @@ TEMPLATE;
     /**
      * Test the scan_template_source_for_dependencies function.
      *
-     * @dataProvider test_scan_template_source_for_dependencies_test_cases()
+     * @dataProvider scan_template_source_for_dependencies_test_cases()
      * @param mustache_template_source_loader $loader The loader
      * @param string $source The template to test
      * @param string $expected The expected output

lib/tests/output_mustache_helper_collection_test.php

@@ -14,19 +14,15 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
-/**
- * Unit tests for lib/classes/output/mustache_helper_collection
- *
- * @copyright 2019 Ryan Wyllie <ryan@moodle.com>
- * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
- */
-
-defined('MOODLE_INTERNAL') || die();
-
 use core\output\mustache_helper_collection;
 
 /**
  * Unit tests for the mustache_helper_collection class.
+ *
+ * @package   core
+ * @copyright 2019 Ryan Wyllie <ryan@moodle.com>
+ * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ * @covers    \core\output\mustache_helper_collection
  */
 class core_output_mustache_helper_collection_testcase extends advanced_testcase {
     /**
@@ -71,7 +67,7 @@ class core_output_mustache_helper_collection_testcase extends advanced_testcase
                 'input' => 'core, {{#js}} some nasty JS {{/js}}, test',
                 'expected' => 'core, {{}}, test'
             ],
-            'single blacklist 3' => [
+            'single blacklist 4' => [
                 'blacklist' => ['js'],
                 'input' => 'core, {{#ok}} this is ok {{/ok}}, {{#js}} some nasty JS {{/js}}',
                 'expected' => 'core, {{#ok}} this is ok {{/ok}}, {{}}'
@@ -116,7 +112,7 @@ class core_output_mustache_helper_collection_testcase extends advanced_testcase
                 'input' => '{{#foo}} blah {{/foo}}, {{#js}} js {{/js}}, {{#foo}} blah {{/foo}}',
                 'expected' => '{{}}'
             ],
-            'multiple blacklist 4' => [
+            'multiple blacklist 5' => [
                 'blacklist' => ['js', 'foo'],
                 'input' => 'core, move, {{#js}} JS {{#foo}} blah {{/foo}} {{/js}}',
                 'expected' => 'core, move, {{}}'

lib/tests/plugininfo/base_test.php

@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
 
+declare(strict_types = 1);
+
+namespace core\plugininfo;
+
+use testable_core_plugin_manager;
+use testable_plugininfo_base;
+
 /**
  * Unit tests for plugin base class.
  *
@@ -21,20 +28,6 @@
  * @copyright 2019 Andrew Nicols
  * @license   http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-
-declare(strict_types = 1);
-namespace core\plugininfo;
-
-defined('MOODLE_INTERNAL') || die();
-
-use core_plugin_manager;
-use testable_core_plugin_manager;
-use testable_plugininfo_base;
-
-
-/**
- * Tests of the basic API of the plugin manager.
- */
 class base_testcase extends \advanced_testcase {
 
     /**
@@ -172,7 +165,7 @@ class base_testcase extends \advanced_testcase {
      * Test the load_disk_version function to check that it handles a range of correct supported and incompatible field
      * definitions.
      *
-     * @dataProvider test_load_disk_version_branch_supports_provider
+     * @dataProvider load_disk_version_branch_supports_provider
      * @param array|null $supported Supported versions to inject
      * @param string|int|null $incompatible Incompatible version to inject.
      * @param int $version Version to test
@@ -204,7 +197,7 @@ class base_testcase extends \advanced_testcase {
      *
      * @return array
      */
-    public function test_load_disk_version_branch_supports_provider(): array {
+    public function load_disk_version_branch_supports_provider(): array {
         return [
             'Range, branch in support, lowest' => [
                 'supported' => [29, 31],

lib/tests/task_manager_test.php

@@ -32,7 +32,7 @@ defined('MOODLE_INTERNAL') || die();
  */
 class core_task_manager_testcase extends advanced_testcase {
 
-    public function test_ensure_adhoc_task_qos_provider() {
+    public function ensure_adhoc_task_qos_provider() {
         return [
             [
                 [],
@@ -176,7 +176,7 @@ class core_task_manager_testcase extends advanced_testcase {
     /**
      * Test that the Quality of Service reordering works.
      *
-     * @dataProvider test_ensure_adhoc_task_qos_provider
+     * @dataProvider ensure_adhoc_task_qos_provider
      *
      * @param array $input array of tasks
      * @param array $expected array of reordered tasks

lib/tests/upgradelib_test.php

@@ -1526,4 +1526,27 @@ class upgradelib_test extends advanced_testcase {
         $this->assertEquals('admin_dir_usage', $result->getInfo());
         $this->assertFalse($result->getStatus());
     }
+
+    /**
+     * Test the check_mod_assignment check if mod_assignment is still used.
+     *
+     * @covers ::check_mod_assignment
+     * @return void
+     */
+    public function test_check_mod_assignment_is_used(): void {
+        global $DB;
+
+        $this->resetAfterTest();
+        $result = new environment_results('custom_checks');
+
+        if ($DB->get_manager()->table_exists('assignment')) {
+            $DB->insert_record('assignment', (object)['name' => 'test_assign', 'intro' => 'test_assign_intro']);
+
+            $this->assertNotNull(check_mod_assignment($result));
+            $this->assertEquals('Assignment 2.2 is in use', $result->getInfo());
+            $this->assertFalse($result->getStatus());
+        } else {
+            $this->assertTrue($result->getStatus());
+        }
+    }
 }

lib/upgrade.txt

@@ -1,6 +1,14 @@
 This files describes API changes in core libraries and APIs,
 information provided here is intended especially for developers.
 
+===3.9.22===
+* Added a new parameter in address_in_subnet to give us the ability to check for 0.0.0.0 or not.
+
+===3.9.21===
+* Added 'extrainfo' in the DB options config. Its extra information for the DB driver, e.g. SQL Server,
+  has additional configuration according to its environment, which the administrator can specify to alter and
+  override any connection options.
+
 ===3.9.12===
 * Two new helper functions have been added to lib/datalib.php, for safely preparing SQL ORDER BY statements where user
   interactions define sort parameters (see the respective docblocks for full details and examples):

lib/upgradelib.php

@@ -614,7 +614,7 @@ function upgrade_plugins($type, $startcallback, $endcallback, $verbose) {
 
         // Throw exception if plugin is incompatible with moodle version.
         if (!empty($plugin->incompatible)) {
-            if ($CFG->branch <= $plugin->incompatible) {
+            if ($CFG->branch >= $plugin->incompatible) {
                 throw new plugin_incompatible_exception($component, $plugin->version);
             }
         }
@@ -2766,3 +2766,29 @@ function check_xmlrpc_usage(environment_results $result): ?environment_results {
 
     return null;
 }
+
+/**
+ * Check whether the mod_assignment is currently being used.
+ *
+ * @param environment_results $result
+ * @return environment_results|null
+ */
+function check_mod_assignment(environment_results $result): ?environment_results {
+    global $DB, $CFG;
+
+    // Check the number of records.
+    if ($DB->get_manager()->table_exists('assignment') && $DB->count_records('assignment') > 0) {
+        $result->setInfo('Assignment 2.2 is in use');
+        $result->setFeedbackStr('modassignmentinuse');
+        return $result;
+    }
+
+    // Check for mod_assignment subplugins.
+    if (is_dir($CFG->dirroot . '/mod/assignment/type')) {
+        $result->setInfo('Assignment 2.2 subplugins present');
+        $result->setFeedbackStr('modassignmentsubpluginsexist');
+        return $result;
+    }
+
+    return null;
+}

media/player/videojs/tests/behat/modules.feature

@@ -34,10 +34,10 @@ Feature: Embed videos without the media filter
 
   @javascript
   Scenario: Add a video as content to a lesson. Make sure media filters work
-    When I add a "Lesson" to section "1"
-    And I set the following fields to these values:
-      | Name | Lesson with video |
-      | Description | Example of a video in a lesson |
+    Given the following "activities" exist:
+      | activity | course               | section | name              |
+      | lesson   | Acceptance test site | 1       | Lesson with video |
+    When I am on the "Lesson with video" "lesson activity editing" page
     And I expand all fieldsets
     And I upload "media/player/videojs/tests/fixtures/test.mov" file to "Linked media" filemanager
     And I press "Save and display"

message/tests/api_test.php

@@ -6443,7 +6443,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
     /**
      * Data provider for test_get_conversation_counts().
      */
-    public function test_get_conversation_counts_test_cases() {
+    public function get_conversation_counts_test_cases() {
         $typeindividual = \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL;
         $typegroup = \core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP;
         $typeself = \core_message\api::MESSAGE_CONVERSATION_TYPE_SELF;
@@ -6806,7 +6806,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
     /**
      * Test the get_conversation_counts() function.
      *
-     * @dataProvider test_get_conversation_counts_test_cases()
+     * @dataProvider get_conversation_counts_test_cases
      * @param array $conversationconfigs Conversations to create
      * @param int $deletemessagesuser The user who is deleting the messages
      * @param array $deletemessages The list of messages to delete (by index)
@@ -6929,7 +6929,7 @@ class core_message_api_testcase extends core_message_messagelib_testcase {
     /**
      * Test the get_unread_conversation_counts() function.
      *
-     * @dataProvider test_get_conversation_counts_test_cases()
+     * @dataProvider get_conversation_counts_test_cases
      * @param array $conversationconfigs Conversations to create
      * @param int $deletemessagesuser The user who is deleting the messages
      * @param array $deletemessages The list of messages to delete (by index)

message/tests/behat/message_preferences.feature

@@ -18,8 +18,7 @@ Feature: To be able to see and save user message preferences as admin
     And I navigate to "Messaging > Notification settings" in site administration
     And I set the field "email" to "1"
     And I press "Save changes"
-    And I navigate to "Users > Accounts > Browse list of users" in site administration
-    And I click on "Student 1" "link" in the "Student 1" "table_row"
+    And I am on the "student1" "user > profile" page
     And I click on "Preferences" "link" in the "#region-main-box" "css_element"
     And I click on "Message preferences" "link" in the "#region-main-box" "css_element"
     And I click on "//label[@data-state='loggedoff']" "xpath_element"

message/tests/externallib_test.php

@@ -6803,7 +6803,7 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
     /**
      * Data provider for test_get_conversation_counts().
      */
-    public function test_get_conversation_counts_test_cases() {
+    public function get_conversation_counts_test_cases() {
         $typeindividual = \core_message\api::MESSAGE_CONVERSATION_TYPE_INDIVIDUAL;
         $typegroup = \core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP;
         $typeself = \core_message\api::MESSAGE_CONVERSATION_TYPE_SELF;
@@ -7166,7 +7166,7 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
     /**
      * Test the get_conversation_counts() function.
      *
-     * @dataProvider test_get_conversation_counts_test_cases()
+     * @dataProvider get_conversation_counts_test_cases()
      * @param array $conversationconfigs Conversations to create
      * @param int $deletemessagesuser The user who is deleting the messages
      * @param array $deletemessages The list of messages to delete (by index)
@@ -7263,7 +7263,7 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
     /**
      * Test the get_unread_conversation_counts() function.
      *
-     * @dataProvider test_get_conversation_counts_test_cases()
+     * @dataProvider get_conversation_counts_test_cases
      * @param array $conversationconfigs Conversations to create
      * @param int $deletemessagesuser The user who is deleting the messages
      * @param array $deletemessages The list of messages to delete (by index)

mod/assign/tests/behat/group_submission.feature

@@ -319,3 +319,73 @@ Feature: Group assignment submissions
     When I navigate to "View all submissions" in current page administration
     Then "Student 1" row "Status" column of "generaltable" table should contain "Submitted for grading"
     And "Student 2" row "Status" column of "generaltable" table should contain "Submitted for grading"
+
+  @javascript @_file_upload
+  Scenario: Student can submit or edit group assignment depending on 'requireallteammemberssubmit' setting
+    Given the following "courses" exist:
+      | fullname | shortname | category | groupmode   |
+      | Course 1 | C1        | 0        | 2           |
+    And the following "users" exist:
+      | username | firstname | lastname  | email                |
+      | teacher1 | Terry     | Alexander | teacher1@example.com |
+      | student1 | Sam       | Edwards   | student1@example.com |
+      | student2 | Carlos    | Rivera    | student2@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+      | student2 | C1     | student        |
+    And the following "groups" exist:
+      | name    | course | idnumber |
+      | Group 1 | C1     | G1       |
+    And the following "group members" exist:
+      | user     | group |
+      | student1 | G1    |
+      | student2 | G1    |
+    And the following "activities" exist:
+      | activity | course | name     | assignsubmission_onlinetext_enabled | assignsubmission_file_enabled | assignsubmission_file_maxfiles | assignsubmission_file_maxsizebytes | submissiondrafts | teamsubmission | requireallteammemberssubmit |
+      | assign   | C1     | Assign 1 | 1                                   | 1                             | 1                              | 2097152                            | 1                | 1              | 1                           |
+      | assign   | C1     | Assign 2 | 1                                   | 1                             | 1                              | 2097152                            | 0                | 1              | 0                           |
+    # Submit an assignment with 'requireallteammemberssubmit' setting enabled
+    When I am on the "Assign 1" "assign activity" page logged in as student1
+    Then I should see "Group 1"
+    And I should not see "Carlos Rivera"
+    And I press "Add submission"
+    And I set the field "Online text" to "student1 submission"
+    And I upload "lib/tests/fixtures/empty.txt" file to "File submissions" filemanager
+    And I press "Save changes"
+    # Confirm that Submission status remains as draft and all students appear because 'Submit assignment' was not yet clicked
+    And I should see "Draft (not submitted)" in the "Submission status" "table_row"
+    And I should see "Users who need to submit: Sam Edwards, Carlos Rivera"
+    And I press "Submit assignment"
+    And I press "Continue"
+    # Confirm that Submission status remains as draft and only student2 appears because student2 has not yet submitted assignment
+    And I am on the "Assign 1" "assign activity" page logged in as student2
+    And I should see "Draft (not submitted)" in the "Submission status" "table_row"
+    And I should see "Users who need to submit: Carlos Rivera"
+    And I press "Edit submission"
+    And I set the field "Online text" to "student2 updated submission"
+    And I delete "empty.txt" from "File submissions" filemanager
+    And I upload "lib/tests/fixtures/tabfile.csv" file to "File submissions" filemanager
+    And I press "Save changes"
+    And I press "Submit assignment"
+    And I press "Continue"
+    # Confirm that Submission status is now Submitted for grading and all changes made by student2 is reflected on assignment
+    And I am on the "Assign 1" "assign activity" page logged in as student1
+    And I should see "Submitted for grading" in the "Submission status" "table_row"
+    And I should see "student2 updated submission" in the "Online text" "table_row"
+    And I should see "tabfile.csv" in the "File submissions" "table_row"
+    And I should not see "student1 submission" in the "Online text" "table_row"
+    And I should not see "empty.txt" in the "File submissions" "table_row"
+    # Submit an assignment with 'requireallteammemberssubmit' disabled
+    And I am on the "Assign 2" "assign activity" page logged in as student1
+    And I should see "Group 1"
+    And I should not see "Carlos Rivera"
+    And I press "Add submission"
+    And I set the field "Online text" to "student1 submission"
+    And I upload "lib/tests/fixtures/empty.txt" file to "File submissions" filemanager
+    And I press "Save changes"
+    # Confirm that Submission status is immediately set to Submitted for grading for all students after student1 submits assignments
+    And I am on the "Assign 2" "assign activity" page logged in as student2
+    And I should see "Submitted for grading" in the "Submission status" "table_row"
+    And I should not see "Users who need to submit"

mod/assign/tests/behat/submission_notifications.feature

@@ -0,0 +1,48 @@
+@mod @mod_assign @javascript
+Feature: Manage assignment submission web notifications
+  In order to receive assignment submission notifications
+  As a teacher
+  I need to be able to turn on web notifications for assignment submission
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email                |
+      | student1 | Student   | 1        | student1@example.com |
+      | teacher1 | Teacher   | 1        | teacher1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    And the following "activity" exists:
+      | activity                            | assign   |
+      | course                              | C1       |
+      | name                                | Assign 1 |
+      | assignsubmission_onlinetext_enabled | 1        |
+      | assignsubmission_file_enabled       | 0        |
+      | submissiondrafts                    | 0        |
+      | sendnotifications                   | 1        |
+    And the following "mod_assign > submissions" exist:
+      | assign   | user     | onlinetext                  |
+      | Assign 1 | student1 | I'm the student1 submission |
+
+  Scenario: Teacher can choose to receive assignment notification submissions
+    Given I log in as "teacher1"
+    When I open the notification popover
+    Then I should see "You have no notifications"
+    # Enable assignment submission notification
+    And I follow "Preferences" in the user menu
+    And I click on "Notification preferences" "link" in the "#page-content" "css_element"
+    And I click on "//td[@data-processor-name='popup']//label[@class='preference-state']" "xpath_element" in the "Assignment notifications" "table_row"
+    # Update assignment submission to generate a notification
+    And I am on the "Assign 1" "assign activity" page logged in as student1
+    # This should generate a notification
+    And I press "Edit submission"
+    And I set the field "Online text" to "updated"
+    And I press "Save changes"
+    # Confirm that teacher received assignment submission notification
+    And I log in as "teacher1"
+    And I open the notification popover
+    Then I should see "Student 1 has updated their submission for assignment Assign 1"

mod/assign/tests/behat/submission_statement.feature

@@ -0,0 +1,55 @@
+@mod @mod_assign
+Feature: In an assignment, teacher can require submission statements
+  In order to require students to accept an assignment submission statement
+  As a teacher
+  I need to enable "Require that students accept the submission statement"
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "users" exist:
+      | username | firstname | lastname | email                |
+      | teacher1 | Terry     | Teacher  | teacher1@example.com |
+      | student1 | Sam       | Student | student1@example.com |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+      | student1 | C1     | student        |
+    And the following "activity" exists:
+      | activity                            | assign      |
+      | course                              | C1          |
+      | name                                | Test assign |
+      | submissiondrafts                    | 1           |
+      | requiresubmissionstatement          | 1           |
+      | assignsubmission_onlinetext_enabled | 1           |
+
+  Scenario: Student is required to accept assignment submission statement
+    Given I am on the "Test assign" "assign activity" page logged in as student1
+    And I press "Add submission"
+    And I set the field "Online text" to "My submission text."
+    And I press "Save changes"
+    And I should see "Draft (not submitted)" in the "Submission status" "table_row"
+    When I press "Submit assignment"
+    Then I should see "This submission is my own work, except where I have acknowledged the use of the works of other people."
+    And I press "Continue"
+    And I should see "Confirm submission"
+    And I should see "- Required"
+    And I set the field "submissionstatement" to "1"
+    And I press "Continue"
+    And I should see "Submitted for grading" in the "Submission status" "table_row"
+
+  Scenario: Student is not required to accept assignment submission statement
+    Given I am on the "Test assign" "assign activity editing" page logged in as teacher1
+    And I set the following fields to these values:
+      | Require that students accept the submission statement | No |
+    And I press "Save and display"
+    And I am on the "Test assign" "assign activity" page logged in as student1
+    And I press "Add submission"
+    And I set the field "Online text" to "My submission text."
+    And I press "Save changes"
+    And I should see "Draft (not submitted)" in the "Submission status" "table_row"
+    When I press "Submit assignment"
+    Then I should not see "This submission is my own work, except where I have acknowledged the use of the works of other people."
+    And I press "Continue"
+    And I should see "Submitted for grading" in the "Submission status" "table_row"

mod/assign/tests/locallib_test.php

@@ -859,7 +859,7 @@ class mod_assign_locallib_testcase extends advanced_testcase {
      * We only test combinations of plugins here. Individual plugins are tested
      * in their respective test files.
      *
-     * @dataProvider test_new_submission_empty_testcases
+     * @dataProvider new_submission_empty_testcases
      * @param string $data The file submission data
      * @param bool $expected The expected return value
      */
@@ -899,7 +899,7 @@ class mod_assign_locallib_testcase extends advanced_testcase {
      *
      * @return array of testcases
      */
-    public function test_new_submission_empty_testcases() {
+    public function new_submission_empty_testcases() {
         return [
             'With file and onlinetext' => [
                 [

mod/book/tests/behat/create_chapters.feature

@@ -14,19 +14,18 @@ Feature: In a book, create chapters and sub chapters
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name      | section |
+      | book     | C1     | Test book | 1       |
+    And the following "mod_book > chapter" exists:
+      | book    | Test book                       |
+      | title   | Dummy first chapter             |
+      | content | Dream is the start of a journey |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
-    And I add a "Book" to section "1" and I fill the form with:
-      | Name | Test book |
-      | Description | A book about dreams! |
 
   Scenario: Create chapters and sub chapters and navigate between them
-    Given I follow "Test book"
-    And I should see "Add new chapter"
-    And I set the following fields to these values:
-      | Chapter title | Dummy first chapter |
-      | Content | Dream is the start of a journey |
-    And I press "Save changes"
+    Given I am on the "Test book" "book activity" page
     And I should see "1. Dummy first chapter" in the "Table of contents" "block"
     And I click on "Add new chapter after \"Dummy first chapter\"" "link" in the "Table of contents" "block"
     And I should see "Dummy first chapter"
@@ -62,12 +61,7 @@ Feature: In a book, create chapters and sub chapters
     And I should see "1. Dummy first chapter" in the "strong" "css_element"
 
   Scenario: Change editing mode for an individual chapter
-    Given I follow "Test book"
-    And I should see "Add new chapter"
-    And I set the following fields to these values:
-      | Chapter title | Dummy first chapter |
-      | Content | Dream is the start of a journey |
-    And I press "Save changes"
+    Given I am on the "Test book" "book activity" page
     And I should see "1. Dummy first chapter" in the "Table of contents" "block"
     And "Edit chapter \"1. Dummy first chapter\"" "link" should exist in the "Table of contents" "block"
     And "Delete chapter \"1. Dummy first chapter\"" "link" should exist in the "Table of contents" "block"

mod/book/tests/behat/display_book_description.feature

@@ -14,27 +14,21 @@ Feature: Display the book description in the book and optionally in the course
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name      | intro                |
+      | book     | C1     | Test book | A book about dreams! |
+    And the following "mod_book > chapter" exists:
+      | book    | Test book                       |
+      | title   | Dummy first chapter             |
+      | content | Dream is the start of a journey |
     And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Book" to section "1" and I fill the form with:
-      | Name | Test book |
-      | Description | A book about dreams! |
-    And I follow "Test book"
-    And I should see "Add new chapter"
-    And I set the following fields to these values:
-      | Chapter title | Dummy first chapter |
-      | Content | Dream is the start of a journey |
-    And I press "Save changes"
 
   Scenario: Description is displayed in the book
-    Given I am on "Course 1" course homepage
-    When I follow "Test book"
+    When I am on the "Test book" "book activity" page
     Then I should see "A book about dreams!"
 
   Scenario: Show book description in the course homepage
-    Given I am on "Course 1" course homepage
-    And I follow "Test book"
-    And I navigate to "Edit settings" in current page administration
+    Given I am on the "Test book" "book activity editing" page
     And the following fields match these values:
       | Display description on course page | |
     And I set the following fields to these values:
@@ -44,9 +38,7 @@ Feature: Display the book description in the book and optionally in the course
     Then I should see "A book about dreams!"
 
   Scenario: Hide book description in the course homepage
-    Given I am on "Course 1" course homepage
-    And I follow "Test book"
-    And I navigate to "Edit settings" in current page administration
+    Given I am on the "Test book" "book activity editing" page
     And the following fields match these values:
       | Display description on course page | |
     And I press "Save and return to course"

mod/book/tests/behat/edit_navigation_options.feature

@@ -18,17 +18,14 @@ Feature: In a book, change the navigation options
     And I am on "Course 1" course homepage with editing mode on
 
   Scenario: Change navigation options
-    Given I add a "Book" to section "1" and I fill the form with:
-      | Name | Test book |
-      | Description | A book about lorem ipsum |
-      | Style of navigation | TOC Only         |
-    And I follow "Test book"
-    And I should see "Add new chapter"
-    And I set the following fields to these values:
-      | Chapter title | Test chapter 1 |
-      | Content | Lorem ipsum dolor sit amet |
-    And I press "Save changes"
-    And I should see "Test book"
+    Given the following "activities" exist:
+      | activity | course | name      | navstyle |
+      | book     | C1     | Test book | 0        |
+    And the following "mod_book > chapter" exists:
+      | book    | Test book                  |
+      | title   | Test chapter 1             |
+      | content | Lorem ipsum dolor sit amet |
+    And I am on the "Test book" "book activity" page
     And I should see "1. Test chapter 1"
     And I click on "Add new chapter" "link" in the "Table of contents" "block"
     And I set the following fields to these values:

mod/book/tests/behat/edit_tags.feature

@@ -17,7 +17,6 @@ Feature: Edited book chapters handle tags correctly
       | course      | C1                  |
       | idnumber    | book1               |
       | name        | Test book           |
-      | description | A book about dreams |
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
@@ -47,7 +46,6 @@ Feature: Edited book chapters handle tags correctly
     And I follow "Add standard tags"
     And I set the field "Enter comma-separated list of new tags" to "OT1, OT2, OT3"
     And I press "Continue"
-    And I log out
     And I am on the "Test book" "book activity" page logged in as teacher1
     And I open the autocomplete suggestions list
     And I should see "OT1" in the ".form-autocomplete-suggestions" "css_element"

mod/book/tests/behat/reorganize_chapters.feature

@@ -14,40 +14,19 @@ Feature: In a book, chapters and subchapters can be rearranged
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name      |
+      | book     | C1     | Test book |
+    And the following "mod_book > chapters" exist:
+      | book      | title                        | content                | pagenum |subchapter |
+      | Test book | Originally first chapter     | #1 chapter content     | 1       | 0         |
+      | Test book | A great second chapter       | #2 chapter content     | 2       | 0         |
+      | Test book | Second chapter, subchapter 1 | #21 subchapter content | 3       | 1         |
+      | Test book | Second chapter, subchapter 2 | #22 subchapter content | 4       | 1         |
+      | Test book | There aren't 2 without 3     | #3 subchapter content  | 5       | 0         |
     And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
-    And I add a "Book" to section "1" and I fill the form with:
-      | Name | Test book |
-      | Description | A book about rearrangements! |
     And I follow "Test book"
-    And I should see "Add new chapter"
-    And I set the following fields to these values:
-      | Chapter title | Originally first chapter |
-      | Content | #1 chapter content |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"Originally first chapter\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | A great second chapter |
-      | Content | #2 chapter content |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"A great second chapter\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | Second chapter, subchapter 1 |
-      | Content | #21 subchapter content |
-      | Subchapter | 1 |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"Second chapter, subchapter 1\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | Second chapter, subchapter 2 |
-      | Content | #22 subchapter content |
-      | Subchapter | 1 |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"Second chapter, subchapter 2\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | There aren't 2 without 3 |
-      | Content | #3 subchapter content |
-      | Subchapter | 0 |
-    And I press "Save changes"
 
   Scenario: Moving chapters down rearranges them properly
     Given I click on "Move chapter down \"1. Originally first chapter\"" "link"

mod/book/tests/behat/show_hide_chapters.feature

@@ -20,34 +20,17 @@ Feature: Book activity chapter visibility management
       | course   | C1                  |
       | activity | book                |
       | name     | Test book           |
-    And I am on the "Test book" "book activity" page logged in as teacher1
-    And I set the following fields to these values:
-      | Chapter title | First chapter |
-      | Content | First chapter |
-    And I press "Save changes"
+    And the following "mod_book > chapters" exist:
+      | book      | title          | content        | pagenum |subchapter |
+      | Test book | First chapter  | First chapter  | 1       | 0         |
+      | Test book | Second chapter | Second chapter | 2       | 0         |
+      | Test book | Sub chapter    | Sub chapter    | 3       | 1         |
+      | Test book | Third chapter  | Third chapter  | 4       | 0         |
+      | Test book | Fourth chapter | Fourth chapter | 5       | 0         |
+    And I am on the "Course 1" course page logged in as teacher1
     And I turn editing mode on
-    And I click on "Add new chapter after \"First chapter\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | Second chapter |
-      | Content | Second chapter |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"Second chapter\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | Sub chapter |
-      | subchapter | 1 |
-      | Content | Sub chapter |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"Sub chapter\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | Third chapter |
-      | subchapter | 0 |
-      | Content | Third chapter |
-    And I press "Save changes"
-    And I click on "Add new chapter after \"Third chapter\"" "link"
-    And I set the following fields to these values:
-      | Chapter title | Fourth chapter |
-      | Content | Fourth chapter |
-    And I press "Save changes"
+    And I am on the "Test book" "book activity" page
+    And I click on "4. Fourth chapter" "link" in the "Table of contents" "block"
 
   @javascript
   Scenario: Show/hide chapters and subchapters
@@ -68,7 +51,6 @@ Feature: Book activity chapter visibility management
     And I follow "Next"
     And I should see "Fourth chapter" in the ".book_content" "css_element"
     And I follow "Exit book"
-    And I log out
     And I am on the "Test book" "book activity" page logged in as student1
     And I should not see "Second chapter" in the "Table of contents" "block"
     And I should not see "Third chapter" in the "Table of contents" "block"

mod/folder/tests/behat/folder_file_details.feature

@@ -0,0 +1,48 @@
+@mod @mod_resource @_file_upload
+Feature: Details of uploaded file in the resource can be changed
+  In order to change details of an uploaded file in a folder resource
+  As a teacher
+  I should be able to upload a file
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email          |
+      | teacher1 | Teacher   | 1        | t1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name    |
+      | folder   | C1     | Folder1 |
+
+  @javascript
+  Scenario: Uploaded file details can be changed
+    Given I am on the "Folder1" "folder activity" page logged in as teacher1
+    And I click on "Edit" "button"
+    # Upload a file in folder resource
+    And I upload "lib/tests/fixtures/empty.txt" file to "Files" filemanager
+    And I press "Save changes"
+    And I click on "Edit" "button"
+    And I click on "empty.txt" "link"
+    # Initially, file details are set to default values
+    And the following fields match these values:
+      | Name    | empty.txt             |
+      | Author  | Teacher 1             |
+      | licence | Licence not specified |
+    # Update the file details for testing
+    When I set the following fields to these values:
+      | Name    | empty_file.txt      |
+      | Author  | Teacher 1           |
+      | licence | All rights reserved |
+    And I press "Update"
+    And I press "Save changes"
+    # Confirm that file details have been updated correctly
+    And I click on "Edit" "button"
+    And I click on "empty_file.txt" "link"
+    Then the following fields match these values:
+      | Name    | empty_file.txt      |
+      | Author  | Teacher 1           |
+      | licence | All rights reserved |

mod/forum/amd/build/discussion_list.min.js

@@ -6,6 +6,6 @@
  * @copyright  2019 Andrew Nicols <andrew@nicols.co.uk>
  * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
  */
-define("mod_forum/discussion_list",["jquery","core/templates","core/str","core/notification","mod_forum/subscription_toggle","mod_forum/selectors","mod_forum/repository","core/pubsub","mod_forum/forum_events"],(function($,Templates,Str,Notification,SubscriptionToggle,Selectors,Repository,PubSub,ForumEvents){return{init:function(root){SubscriptionToggle.init(root,!1,(function(toggleElement,context){var toggleId=toggleElement.attr("id"),newTargetState=context.userstate.subscribed?0:1;toggleElement.data("targetstate",newTargetState);var stringKey=context.userstate.subscribed?"unsubscribediscussion":"subscribediscussion";return Str.get_string(stringKey,"mod_forum").then((function(string){return toggleElement.closest("td").find('label[for="'+toggleId+'"]').find("span").text(string),string}))})),function(root){PubSub.subscribe(ForumEvents.SUBSCRIPTION_TOGGLED,(function(data){var discussionId=data.discussionId,subscribed=data.subscriptionState,discussionListItem=root.find(Selectors.discussion.item+"[data-discussionid= "+discussionId+"]"),subscribedLabel=discussionListItem.find(Selectors.discussion.subscribedLabel);subscribed?(discussionListItem.addClass("subscribed"),subscribedLabel.removeAttr("hidden")):(discussionListItem.removeClass("subscribed"),subscribedLabel.attr("hidden",!0))})),root.on("click",Selectors.favourite.toggle,(function(){var toggleElement=$(this),forumId=toggleElement.data("forumid"),discussionId=toggleElement.data("discussionid"),subscriptionState=toggleElement.data("targetstate");Repository.setFavouriteDiscussionState(forumId,discussionId,subscriptionState).then((function(){return location.reload()})).catch(Notification.exception)})),root.on("click",Selectors.pin.toggle,(function(e){e.preventDefault();var toggleElement=$(this),forumId=toggleElement.data("forumid"),discussionId=toggleElement.data("discussionid"),state=toggleElement.data("targetstate");Repository.setPinDiscussionState(forumId,discussionId,state).then((function(){return location.reload()})).catch(Notification.exception)})),root.on("click",Selectors.lock.toggle,(function(e){var toggleElement=$(this),forumId=toggleElement.data("forumid"),discussionId=toggleElement.data("discussionid"),state=toggleElement.data("state");Repository.setDiscussionLockState(forumId,discussionId,state).then((function(context){var icon=toggleElement.parents(Selectors.summary.actions).find(Selectors.lock.icon),lockedLabel=toggleElement.parents(Selectors.discussion.item).find(Selectors.discussion.lockedLabel);return context.locked?(icon.removeClass("hidden"),lockedLabel.removeAttr("hidden")):(icon.addClass("hidden"),lockedLabel.attr("hidden",!0)),context})).then((function(context){return context.forumid=forumId,Templates.render("mod_forum/discussion_lock_toggle",context)})).then((function(html,js){return Templates.replaceNode(toggleElement,html,js)})).then((function(){return Str.get_string("lockupdated","forum").done((function(s){return Notification.addNotification({message:s,type:"info"})}))})).catch(Notification.exception),e.preventDefault()}))}(root)}}}));
+define("mod_forum/discussion_list",["jquery","core/templates","core/str","core/notification","mod_forum/subscription_toggle","mod_forum/selectors","mod_forum/repository","core/pubsub","mod_forum/forum_events"],(function($,Templates,Str,Notification,SubscriptionToggle,Selectors,Repository,PubSub,ForumEvents){return{init:function(root){SubscriptionToggle.init(root,!1,(function(toggleElement,context){var toggleId=toggleElement.attr("id"),newTargetState=context.userstate.subscribed?0:1;toggleElement.data("targetstate",newTargetState);var stringKey=context.userstate.subscribed?"unsubscribediscussion":"subscribediscussion";return Str.get_string(stringKey,"mod_forum").then((function(string){return toggleElement.closest("td").find('label[for="'+toggleId+'"]').find("span").text(string),string}))})),function(root){PubSub.subscribe(ForumEvents.SUBSCRIPTION_TOGGLED,(function(data){var discussionId=data.discussionId,subscribed=data.subscriptionState,discussionListItem=root.find(Selectors.discussion.item+"[data-discussionid= "+discussionId+"]"),subscribedLabel=discussionListItem.find(Selectors.discussion.subscribedLabel);subscribed?(discussionListItem.addClass("subscribed"),subscribedLabel.removeAttr("hidden")):(discussionListItem.removeClass("subscribed"),subscribedLabel.attr("hidden",!0))})),root.on("click",Selectors.favourite.toggle,(function(e){e.preventDefault();var toggleElement=$(this),forumId=toggleElement.data("forumid"),discussionId=toggleElement.data("discussionid"),subscriptionState=toggleElement.data("targetstate");Repository.setFavouriteDiscussionState(forumId,discussionId,subscriptionState).then((function(){return location.reload()})).catch(Notification.exception)})),root.on("click",Selectors.pin.toggle,(function(e){e.preventDefault();var toggleElement=$(this),forumId=toggleElement.data("forumid"),discussionId=toggleElement.data("discussionid"),state=toggleElement.data("targetstate");Repository.setPinDiscussionState(forumId,discussionId,state).then((function(){return location.reload()})).catch(Notification.exception)})),root.on("click",Selectors.lock.toggle,(function(e){var toggleElement=$(this),forumId=toggleElement.data("forumid"),discussionId=toggleElement.data("discussionid"),state=toggleElement.data("state");Repository.setDiscussionLockState(forumId,discussionId,state).then((function(context){var icon=toggleElement.parents(Selectors.summary.actions).find(Selectors.lock.icon),lockedLabel=toggleElement.parents(Selectors.discussion.item).find(Selectors.discussion.lockedLabel);return context.locked?(icon.removeClass("hidden"),lockedLabel.removeAttr("hidden")):(icon.addClass("hidden"),lockedLabel.attr("hidden",!0)),context})).then((function(context){return context.forumid=forumId,Templates.render("mod_forum/discussion_lock_toggle",context)})).then((function(html,js){return Templates.replaceNode(toggleElement,html,js)})).then((function(){return Str.get_string("lockupdated","forum").done((function(s){return Notification.addNotification({message:s,type:"info"})}))})).catch(Notification.exception),e.preventDefault()}))}(root)}}}));
 
 //# sourceMappingURL=discussion_list.min.js.map

mod/forum/amd/src/discussion_list.js

@@ -57,7 +57,9 @@ define([
             }
         });
 
-        root.on('click', Selectors.favourite.toggle, function() {
+        root.on('click', Selectors.favourite.toggle, function(e) {
+            e.preventDefault();
+
             var toggleElement = $(this);
             var forumId = toggleElement.data('forumid');
             var discussionId = toggleElement.data('discussionid');

mod/forum/tests/behat/forum_display_word_count.feature

@@ -0,0 +1,69 @@
+@mod @mod_forum
+Feature: Forum posts display word count
+  In order to display forum word count
+  As a teacher
+  I need to be able to update forum and set "Display word count" to Yes
+
+  Background:
+    Given the following "users" exist:
+      | username | firstname | lastname | email          |
+      | teacher1 | Teacher   | 1        | t1@example.com |
+    And the following "courses" exist:
+      | fullname | shortname | category |
+      | Course 1 | C1        | 0        |
+    And the following "course enrolments" exist:
+      | user     | course | role           |
+      | teacher1 | C1     | editingteacher |
+
+  Scenario: Forum posts display word count for single simple discussion forum
+    Given the following "activities" exist:
+      | activity | course | name    | type   | displaywordcount | intro             |
+      | forum    | C1     | Forum 1 | single | 1                | Single forum post |
+    When I am on the "Forum 1" "forum activity" page logged in as teacher1
+    Then I should see "3 words"
+    And I am on the "Forum 1" "forum activity editing" page
+    And I expand all fieldsets
+    And I set the field "Display word count" to "No"
+    And I press "Save and display"
+    And I am on the "Forum 1" "forum activity" page
+    And I should not see "3 words"
+
+  Scenario: Forum posts display word count for blog-like forum
+    Given the following "activities" exist:
+      | activity | course | name    | type | displaywordcount |
+      | forum    | C1     | Forum 1 | blog | 1                |
+    And the following "mod_forum > discussions" exist:
+      | forum   | name       | subject    | message                   |
+      | Forum 1 | Blog Forum | Blog Forum | This is a blog forum post |
+    When I am on the "Forum 1" "forum activity" page logged in as teacher1
+    Then I should see "6 words"
+    And I am on the "Forum 1" "forum activity editing" page
+    And I expand all fieldsets
+    And I set the field "Display word count" to "No"
+    And I press "Save and display"
+    And I am on the "Forum 1" "forum activity" page
+    And I should not see "6 words"
+
+  Scenario Outline: Forum posts display word count for other forum types
+    Given the following "activities" exist:
+      | activity | course | name    | type   | displaywordcount |
+      | forum    | C1     | Forum 1 | <type> | 1                |
+    And the following "mod_forum > discussions" exist:
+      | forum   | name      | subject   | message   |
+      | Forum 1 | <typeext> | <typeext> | <message> |
+    When I am on the "Forum 1" "forum activity" page logged in as teacher1
+    And I follow "<typeext>"
+    Then I should see "<count> words"
+    And I am on the "Forum 1" "forum activity editing" page
+    And I expand all fieldsets
+    And I set the field "Display word count" to "No"
+    And I press "Save and display"
+    And I am on the "Forum 1" "forum activity" page
+    And I follow "<typeext>"
+    Then I should not see "<count> words"
+
+    Examples:
+      | type     | typeext         | message                         | count |
+      | general  | General Forum   | General discussion in forum     | 4     |
+      | eachuser | Each User Forum | This is an each user forum post | 7     |
+      | qanda    | Q and A Forum   | This is a Q and A type forum    | 8     |

mod/forum/tests/entities_discussion_test.php

@@ -123,7 +123,7 @@ class mod_forum_entities_discussion_testcase extends advanced_testcase {
      * Test the display period settings for discussions.
      * This covers each individual date function as well as the combination of the 2.
      *
-     * @dataProvider test_diplay_period_options_provider
+     * @dataProvider diplay_period_options_provider
      * @param string $testdescription A basic description of the base assertions.
      * @param int $startoffset Start time offset with current time in seconds.
      * @param int $endoffset End time offset with current time in seconds.
@@ -167,7 +167,7 @@ class mod_forum_entities_discussion_testcase extends advanced_testcase {
      *
      * @return array start/end time offsets and the expected results.
      */
-    public function test_diplay_period_options_provider() {
+    public function diplay_period_options_provider() {
         return array(
             ["No dates set", 0, 0, true, false, true],
             ["Only started date in the future", 100, 0, false, false, false],

mod/imscp/tests/behat/display_imscp_description.feature

@@ -14,52 +14,26 @@ Feature: Display the IMS content package description in the IMSCP and optionally
     And the following "course enrolments" exist:
       | user | course | role |
       | teacher1 | C1 | editingteacher |
+    And the following "activities" exist:
+      | activity | course | name                     | intro                                | packagefilepath                             |
+      | imscp    | C1     | Test IMS content package | Test IMS content package description | mod/imscp/tests/packages/singelscobasic.zip |
 
-  @javascript @_file_upload
   Scenario: Description is displayed in the IMS content package
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "IMS content package" to section "1"
-    And I set the following fields to these values:
-      | Name | Test IMS content package |
-      | Description | Test IMS content package description |
-    And I upload "mod/imscp/tests/packages/singlescobasic.zip" file to "Package file" filemanager
-    And I click on "Save and display" "button"
-    When I am on the "Test IMS content package" "imscp activity" page
+    When I am on the "Test IMS content package" "imscp activity" page logged in as teacher1
     Then I should see "Test IMS content package description"
 
-  @javascript @_file_upload
   Scenario: Show IMS description in the course homepage
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "IMS content package" to section "1"
-    And I set the following fields to these values:
-      | Name | Test IMS content package |
-      | Description | Test IMS content package description |
-    And I upload "mod/imscp/tests/packages/singlescobasic.zip" file to "Package file" filemanager
-    And I click on "Save and display" "button"
-    When I am on the "Test IMS content package" "imscp activity editing" page
+    When I am on the "Test IMS content package" "imscp activity editing" page logged in as teacher1
     And the following fields match these values:
       | Display description on course page | |
     And I set the following fields to these values:
       | Display description on course page | 1 |
     And I press "Save and return to course"
-    When I am on "Course 1" course homepage
     Then I should see "Test IMS content package description"
 
-  @javascript @_file_upload
   Scenario: Hide IMS description in the course homepage
-    Given I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "IMS content package" to section "1"
-    And I set the following fields to these values:
-      | Name | Test IMS content package |
-      | Description | Test IMS content package description |
-    And I upload "mod/imscp/tests/packages/singlescobasic.zip" file to "Package file" filemanager
-    And I click on "Save and display" "button"
-    When I am on the "Test IMS content package" "imscp activity editing" page
+    When I am on the "Test IMS content package" "imscp activity editing" page logged in as teacher1
     And the following fields match these values:
       | Display description on course page | |
     And I press "Save and return to course"
-    When I am on "Course 1" course homepage
     Then I should not see "Test IMS content package description"

mod/imscp/tests/behat/imscp_activity_creation_ui.feature

@@ -0,0 +1,19 @@
+@mod @mod_imscp @javascript @_file_upload
+Feature: Create an IMSCP activity through UI
+  In order to confirm that IMSCP activity creation via UI works correctly
+
+  Background:
+    Given the following "courses" exist:
+      | fullname | shortname | format |
+      | Course 1 | C1        | topics |
+
+  Scenario: IMS activity is created using UI
+    Given I am on the "Course 1" course page logged in as admin
+    And I turn editing mode on
+    And I add a "IMS content package" to section "1"
+    And I set the following fields to these values:
+      | Name        | Test IMS content package 2           |
+      | Description | Test IMS content package description |
+    And I upload "mod/imscp/tests/packages/singlescobasic.zip" file to "Package file" filemanager
+    When I press "Save and return to course"
+    Then I should see "Test IMS content package 2"

mod/lesson/tests/behat/all_other_answers_catch.feature

@@ -16,14 +16,15 @@ Feature: Numeric and short answer questions have a section to catch all other st
       | user | course | role |
       | teacher1 | C1 | editingteacher |
       | student1 | C1 | student |
-    And I log in as "teacher1"
-    And I am on "Course 1" course homepage with editing mode on
-    And I add a "Lesson" to section "1"
+    And the following "activity" exists:
+      | activity      | lesson                  |
+      | course        | C1                      |
+      | idnumber      | 0001                    |
+      | name          | Test lesson name        |
+      | maxattempts   | 3                       |
+    And I am on the "Test lesson name" "lesson activity editing" page logged in as teacher1
     And I set the following fields to these values:
-      | Name | Test lesson name |
-      | Description | Test lesson description |
       | Provide option to try a question again | Yes |
-      | Maximum number of attempts | 3 |
     And I press "Save and display"
 
   Scenario: I can create a numerical question with an option to catch all student responses.
@@ -45,10 +46,7 @@ Feature: Numeric and short answer questions have a section to catch all other st
       | id_answer_editor_0 | End this lesson |
       | id_jumpto_0 | End of lesson |
     And I press "Save page"
-    And I log out
-    And I log in as "student1"
-    And I am on "Course 1" course homepage
-    And I follow "Test lesson name"
+    And I am on the "Test lesson name" "lesson activity" page logged in as student1
     And I set the field "Your answer" to "5"
     And I press "Submit"
     And I should see "That's the wrong answer"
@@ -79,10 +77,7 @@ Feature: Numeric and short answer questions have a section to catch all other st
       | id_answer_editor_0 | End this lesson |
       | id_jumpto_0 | End of lesson |
     And I press "Save page"
-    And I log out
-    And I log in as "student1"
-    And I am on "Course 1" course homepage
-    And I follow "Test lesson name"
+    And I am on the "Test lesson name" "lesson activity" page logged in as student1
     And I set the field "Your answer" to "dog"
     And I press "Submit"
     And I should see "That's the wrong answer"