L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-54640_master' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
David Monllao
2016-05-20 09:04:05 +08:00
parent 5ba78f6231 442a3651ec
commit c879ff69f4
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
+8 -2
View File
@@ -39,7 +39,10 @@ Feature: Enable Block Completion in a course using manual completion by others
And I follow "Course 1"
And I navigate to "Course completion" node in "Reports"
And I follow "Click to mark user complete"
And I trigger cron
# Running completion task just after clicking sometimes fail, as record
# should be created before the task runs.
And I wait "1" seconds
And I run the scheduled task "core\task\completion_regular_task"
And I am on site homepage
And I log out
And I log in as "student1"
@@ -87,7 +90,10 @@ Feature: Enable Block Completion in a course using manual completion by others
And I follow "Course 1"
And I navigate to "Course completion" node in "Reports"
And I follow "Click to mark user complete"
And I trigger cron
# Running completion task just after clicking sometimes fail, as record
# should be created before the task runs.
And I wait "1" seconds
And I run the scheduled task "core\task\completion_regular_task"
And I am on site homepage
And I log out
And I log in as "student1"
blocks/completionstatus/tests/behat/block_completionstatus_manual_self.feature
+4 -1
View File
@@ -35,7 +35,10 @@ Feature: Enable Block Completion in a course using manual self completion
And I should see "Confirm self completion"
And I press "Yes"
And I should see "Status: In progress" in the "Course completion status" "block"
And I trigger cron
# Running completion task just after clicking sometimes fail, as record
# should be created before the task runs.
And I wait "1" seconds
And I run the scheduled task "core\task\completion_regular_task"
And I am on site homepage
And I follow "Course 1"
Then I should see "Status: Complete" in the "Course completion status" "block"
completion/tests/behat/teacher_manual_completion.feature
+3 -3
View File
@@ -37,10 +37,10 @@ Feature: Allow teachers to manually mark users as complete when configured
And I follow "View course report"
And I should see "Student First"
And I follow "Click to mark user complete"
# Running cron just after clicking sometimes fail, as record
# should be created before the cron runs.
# Running completion task just after clicking sometimes fail, as record
# should be created before the task runs.
And I wait "1" seconds
And I trigger cron
And I run the scheduled task "core\task\completion_regular_task"
And I am on site homepage
And I log out
Then I log in as "student1"