Merge branch 'MDL-70726-3.8' of https://github.com/NashTechOpenUniversity/moodle into MOODLE_38_STABLE

admin/tool/uploaduser/tests/behat/upload_users.feature

@@ -132,12 +132,12 @@ Feature: Upload users
     # Boost check.
     And I log in as "jonest"
     And I am on "Maths" course homepage
-    And "Turn editing on" "button" should not exist
+    And "Calendar" "link" should be visible
     And I log out
     # Classic check.
     And I log in as "reznor"
     And I am on "Maths" course homepage
-    And "Turn editing on" "button" should exist
+    And "Calendar" "link" should not be visible
 
   @javascript
   Scenario: Upload users setting their user theme when allowuserthemes is false

lib/tests/behat/behat_general.php

@@ -995,7 +995,7 @@ EOF;
             // Using the spin method as we want a reduced timeout but there is no need for a 0.1 seconds interval
             // because in the optimistic case we will timeout.
             // If all goes good it will throw an ElementNotFoundExceptionn that we will catch.
-            return $this->find($selectortype, $element, $exception, false, behat_base::get_reduced_timeout());
+            $this->find($selectortype, $element, $exception, false, behat_base::get_reduced_timeout());
         } catch (ElementNotFoundException $e) {
             // We expect the element to not be found.
             return;