mirror of
https://github.com/moodle/moodle.git
synced 2025-08-06 17:36:38 +02:00
Merge branch 'MDL-78684-master' of https://github.com/andelacruz/moodle
This commit is contained in:
commit
b71bec8475
75 changed files with 371 additions and 871 deletions
|
@ -22,7 +22,6 @@ Feature: Allow to mark course as completed without cron for activity completion
|
|||
| course | CC1 |
|
||||
| name | Test assignment name |
|
||||
| idnumber | assign1 |
|
||||
| description | Test assignment description |
|
||||
And the following "blocks" exist:
|
||||
| blockname | contextlevel | reference | pagetypepattern | defaultregion |
|
||||
| completionstatus | Course | CC1 | course-view-* | side-pre |
|
||||
|
@ -88,7 +87,6 @@ Feature: Allow to mark course as completed without cron for activity completion
|
|||
And I click on "Grade" "link" in the "student1@example.com" "table_row"
|
||||
And I set the field "Grade out of 100" to "40"
|
||||
And I click on "Save changes" "button"
|
||||
And I am on "Completion course" course homepage
|
||||
And I am on the "Completion course" course page logged in as student1
|
||||
And I should see "Status: In progress"
|
||||
And I am on the "Test assignment name2" "assign activity" page logged in as teacher1
|
||||
|
@ -96,14 +94,12 @@ Feature: Allow to mark course as completed without cron for activity completion
|
|||
And I click on "Grade" "link" in the "student1@example.com" "table_row"
|
||||
And I set the field "Grade out of 100" to "40"
|
||||
And I click on "Save changes" "button"
|
||||
And I am on "Completion course" course homepage
|
||||
When I am on the "Completion course" course page logged in as student1
|
||||
Then I should see "Status: Complete"
|
||||
|
||||
@javascript
|
||||
Scenario: Course completion should not be updated when teacher grades assignment on course grader report page
|
||||
Given I am on the "Completion course" course page logged in as teacher1
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
Given I am on the "Completion course" "grades > Grader report > View" page logged in as "teacher1"
|
||||
And I turn editing mode on
|
||||
And I give the grade "57" to the user "Student First" for the grade item "Test assignment name"
|
||||
And I press "Save changes"
|
||||
|
@ -117,8 +113,7 @@ Feature: Allow to mark course as completed without cron for activity completion
|
|||
|
||||
@javascript
|
||||
Scenario: Course completion should not be updated when teacher grades assignment on activity grader report page
|
||||
Given I am on the "Completion course" course page logged in as teacher1
|
||||
And I navigate to "View > Single view" in the course gradebook
|
||||
Given I am on the "Completion course" "grades > Single View > View" page logged in as "teacher1"
|
||||
And I click on "Users" "link" in the ".page-toggler" "css_element"
|
||||
And I turn editing mode on
|
||||
And I click on "Student First" in the "user" search widget
|
||||
|
|
|
@ -27,26 +27,18 @@ Feature: Students will be marked as completed if they have achieved a passing gr
|
|||
| completionpassgrade | 1 |
|
||||
| completionusegrade | 1 |
|
||||
| gradepass | 50 |
|
||||
And I log in as "teacher1"
|
||||
And I am on "Course 1" course homepage
|
||||
And I am on the "Course 1" course page logged in as teacher1
|
||||
And "Student First" user has not completed "Test assignment name" activity
|
||||
And I log out
|
||||
|
||||
Scenario: Passing grade completion
|
||||
Given I log in as "teacher1"
|
||||
And I am on "Course 1" course homepage
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
Given I am on the "Course 1" "grades > Grader report > View" page
|
||||
And I turn editing mode on
|
||||
And I give the grade "21" to the user "Student First" for the grade item "Test assignment name"
|
||||
And I give the grade "50" to the user "Student Second" for the grade item "Test assignment name"
|
||||
And I press "Save changes"
|
||||
And I log out
|
||||
When I log in as "student1"
|
||||
And I am on "Course 1" course homepage
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
When I am on the "Course 1" course page logged in as student1
|
||||
Then the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "failed"
|
||||
And I log out
|
||||
And I log in as "student2"
|
||||
And I am on "Course 1" course homepage
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
|
|
|
@ -23,7 +23,6 @@ Feature: Students will be marked as completed and pass/fail
|
|||
| course | C1 |
|
||||
| idnumber | a1 |
|
||||
| name | Test assignment name |
|
||||
| intro | Submit your online text |
|
||||
| assignsubmission_onlinetext_enabled | 1 |
|
||||
| assignsubmission_file_enabled | 0 |
|
||||
| completion | 2 |
|
||||
|
@ -31,61 +30,43 @@ Feature: Students will be marked as completed and pass/fail
|
|||
| completionusegrade | 1 |
|
||||
| gradepass | 50 |
|
||||
| completionpassgrade | 1 |
|
||||
And I log in as "teacher1"
|
||||
And I am on "Course 1" course homepage
|
||||
And I am on the "Course 1" course page logged in as teacher1
|
||||
And "Student First" user has not completed "Test assignment name" activity
|
||||
And I log out
|
||||
And I am on the "Test assignment name" "assign activity" page logged in as student2
|
||||
And I log out
|
||||
And I am on the "Test assignment name" "assign activity" page logged in as student1
|
||||
And I log out
|
||||
|
||||
Scenario: Confirm completion (incomplete/pass/fail) are set correctly
|
||||
Given 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 turn editing mode on
|
||||
And I give the grade "21" to the user "Student First" for the grade item "Test assignment name"
|
||||
And I give the grade "50" to the user "Student Second" for the grade item "Test assignment name"
|
||||
And I give the grade "30" to the user "Student Third" for the grade item "Test assignment name"
|
||||
And I press "Save changes"
|
||||
And I log out
|
||||
When I log in as "student1"
|
||||
And I am on "Course 1" course homepage
|
||||
And the "View" completion condition of "Test assignment name" is displayed as "done"
|
||||
Given the following "grade grades" exist:
|
||||
| gradeitem | user | grade |
|
||||
| Test assignment name | student1 | 21.00 |
|
||||
| Test assignment name | student2 | 50.00 |
|
||||
| Test assignment name | student3 | 30.00 |
|
||||
When I am on "Course 1" course homepage
|
||||
Then the "View" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "failed"
|
||||
And I log out
|
||||
And I log in as "student2"
|
||||
And I am on "Course 1" course homepage
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
And the "View" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And I log out
|
||||
And I log in as "student3"
|
||||
And I am on "Course 1" course homepage
|
||||
And I am on the "Course 1" course page logged in as student3
|
||||
And the "View" completion condition of "Test assignment name" is displayed as "todo"
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "failed"
|
||||
|
||||
@javascript
|
||||
Scenario: Keep current view completion condition when the teacher does the action 'Unlock completion settings'.
|
||||
Given I am on the "Course 1" course page logged in as teacher1
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
And I turn editing mode on
|
||||
And I give the grade "21" to the user "Student First" for the grade item "Test assignment name"
|
||||
And I give the grade "50" to the user "Student Second" for the grade item "Test assignment name"
|
||||
And I press "Save changes"
|
||||
And I am on the "Test assignment name" "assign activity" page logged in as teacher1
|
||||
And I navigate to "Settings" in current page administration
|
||||
Given the following "grade grades" exist:
|
||||
| gradeitem | user | grade |
|
||||
| Test assignment name | student1 | 21.00 |
|
||||
| Test assignment name | student2 | 50.00 |
|
||||
And I am on the "Test assignment name" "assign activity editing" page logged in as teacher1
|
||||
And I expand all fieldsets
|
||||
And I press "Unlock completion settings"
|
||||
And I expand all fieldsets
|
||||
And I should see "Completion options unlocked"
|
||||
And I click on "Save and display" "button"
|
||||
And I log out
|
||||
When I am on the "Course 1" course page logged in as student1
|
||||
Then the "View" completion condition of "Test assignment name" is displayed as "done"
|
||||
And I log out
|
||||
When I am on the "Course 1" course page logged in as student2
|
||||
Then the "View" completion condition of "Test assignment name" is displayed as "done"
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
And the "View" completion condition of "Test assignment name" is displayed as "done"
|
||||
|
|
|
@ -22,7 +22,6 @@ Feature: Students will be shown relevant completion state based on grade item vi
|
|||
| activity | assign |
|
||||
| course | C1 |
|
||||
| name | Test assignment name |
|
||||
| intro | Submit your online text |
|
||||
| assignsubmission_onlinetext_enabled | 1 |
|
||||
| assignsubmission_file_enabled | 0 |
|
||||
| completion | 2 |
|
||||
|
@ -31,34 +30,27 @@ Feature: Students will be shown relevant completion state based on grade item vi
|
|||
| gradepass | 50 |
|
||||
And I am on the "Course 1" course page logged in as teacher1
|
||||
And "Student First" user has not completed "Test assignment name" activity
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student1
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "todo"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "todo"
|
||||
And I log out
|
||||
|
||||
Scenario: Passing grade and receive a grade completions for visible grade item (passgrade completion enabled)
|
||||
Given I am on the "Course 1" course page logged in as teacher1
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
And I turn editing mode on
|
||||
And I give the grade "21" to the user "Student First" for the grade item "Test assignment name"
|
||||
And I give the grade "50" to the user "Student Second" for the grade item "Test assignment name"
|
||||
And I press "Save changes"
|
||||
And I am on "Course 1" course homepage
|
||||
Given the following "grade grades" exist:
|
||||
| gradeitem | user | grade |
|
||||
| Test assignment name | student1 | 21.00 |
|
||||
| Test assignment name | student2 | 50.00 |
|
||||
And I am on the "Course 1" course page logged in as teacher1
|
||||
And "Student First" user has completed "Test assignment name" activity
|
||||
And "Student Second" user has completed "Test assignment name" activity
|
||||
And I log out
|
||||
When I am on the "Course 1" course page logged in as student1
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "failed"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
Then the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
|
||||
Scenario: Passing grade and receive a grade completions for hidden grade item (passgrade completion enabled)
|
||||
Given I am on the "Course 1" course page logged in as teacher1
|
||||
And I navigate to "Setup > Gradebook setup" in the course gradebook
|
||||
Given I am on the "Course 1" "grades > gradebook setup" page logged in as "teacher1"
|
||||
And I hide the grade item "Test assignment name" of type "gradeitem" on "setup" page
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
And I turn editing mode on
|
||||
|
@ -68,28 +60,22 @@ Feature: Students will be shown relevant completion state based on grade item vi
|
|||
And I am on "Course 1" course homepage
|
||||
And "Student First" user has not completed "Test assignment name" activity
|
||||
And "Student Second" user has completed "Test assignment name" activity
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student1
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "todo"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And the "Receive a passing grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
|
||||
Scenario: Receive a grade completion for visible grade item (passgrade completion disabled)
|
||||
Given I am on the "Test assignment name" Activity page logged in as teacher1
|
||||
When I navigate to "Settings" in current page administration
|
||||
Given I am on the "Test assignment name" "assign activity editing" page logged in as teacher1
|
||||
And I set the following fields to these values:
|
||||
| completionpassgrade | 0 |
|
||||
And I press "Save and display"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student1
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "todo"
|
||||
And I should not see "Receive a passing grade"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as teacher1
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1"
|
||||
And I turn editing mode on
|
||||
And I give the grade "21" to the user "Student First" for the grade item "Test assignment name"
|
||||
And I give the grade "50" to the user "Student Second" for the grade item "Test assignment name"
|
||||
|
@ -97,28 +83,22 @@ Feature: Students will be shown relevant completion state based on grade item vi
|
|||
And I am on "Course 1" course homepage
|
||||
And "Student First" user has completed "Test assignment name" activity
|
||||
And "Student Second" user has completed "Test assignment name" activity
|
||||
And I log out
|
||||
When I am on the "Course 1" course page logged in as student1
|
||||
# Once MDL-75582 is fixed "failed" should be changed to "done"
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "failed"
|
||||
And I should not see "Receive a passing grade"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
Then the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
|
||||
Scenario: Receive a grade completion for hidden grade item (passgrade completion disabled)
|
||||
Given I am on the "Test assignment name" Activity page logged in as teacher1
|
||||
When I navigate to "Settings" in current page administration
|
||||
Given I am on the "Test assignment name" "assign activity editing" page logged in as teacher1
|
||||
And I set the following fields to these values:
|
||||
| completionpassgrade | 0 |
|
||||
And I press "Save and display"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student1
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "todo"
|
||||
And I should not see "Receive a passing grade"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as teacher1
|
||||
And I navigate to "Setup > Gradebook setup" in the course gradebook
|
||||
And I am on the "Course 1" "grades > gradebook setup" page logged in as "teacher1"
|
||||
And I hide the grade item "Test assignment name" of type "gradeitem" on "setup" page
|
||||
And I navigate to "View > Grader report" in the course gradebook
|
||||
And I turn editing mode on
|
||||
|
@ -128,10 +108,8 @@ Feature: Students will be shown relevant completion state based on grade item vi
|
|||
And I am on "Course 1" course homepage
|
||||
And "Student First" user has completed "Test assignment name" activity
|
||||
And "Student Second" user has completed "Test assignment name" activity
|
||||
And I log out
|
||||
When I am on the "Course 1" course page logged in as student1
|
||||
Then the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
And I should not see "Receive a passing grade"
|
||||
And I log out
|
||||
And I am on the "Course 1" course page logged in as student2
|
||||
And the "Receive a grade" completion condition of "Test assignment name" is displayed as "done"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue