Merge branch 'MDL-68405-master' of git://github.com/andrewnicols/moodle

Gruntfile.js

@@ -536,12 +536,8 @@ module.exports = function(grunt) {
         formatter.printResults(results);
 
         // Report on the results.
-        // We exit 1 if there is at least one error, otherwise we exit cleanly.
-        if (results.some(result => result.errors.length > 0)) {
-            done(1);
-        } else {
-            done(0);
-        }
+        // The done function takes a bool whereby a falsey statement causes the task to fail.
+        done(results.every(result => result.errors.length === 0));
     };
 
     tasks.startup = function() {

admin/tool/task/tests/behat/clear_fail_delay.feature

@@ -23,7 +23,6 @@ Feature: Clear scheduled task fail delay
     And I should not see "Clear" in the "Send new user passwords" "table_row"
     And I should see "Send new user passwords" in the "tr.table-primary" "css_element"
 
-
   Scenario: Cancel clearing the fail delay
     When I click on "Clear" "text" in the "Send new user passwords" "table_row"
     And I press "Cancel"

mod/h5pactivity/tests/behat/add_h5pactivity.feature

@@ -20,7 +20,6 @@ Feature: Add H5P activity
     And I log in as "teacher1"
     And I am on "Course 1" course homepage with editing mode on
 
-
   @javascript
   Scenario: Add a h5pactivity activity to a course
     When I add a "H5P activity" to section "1"