moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Jun Pataleta 2020-04-14 16:09:42 +08:00
commit e7845f9fa7
3 changed files with 2 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Gruntfile.js
View file

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

1
admin/tool/task/tests/behat/clear_fail_delay.feature
View file

@ -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 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" And I should see "Send new user passwords" in the "tr.table-primary" "css_element"
Scenario: Cancel clearing the fail delay Scenario: Cancel clearing the fail delay
When I click on "Clear" "text" in the "Send new user passwords" "table_row" When I click on "Clear" "text" in the "Send new user passwords" "table_row"
And I press "Cancel" And I press "Cancel"

1
mod/h5pactivity/tests/behat/add_h5pactivity.feature
View file

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