Skip to content

Commit

Permalink
Merge branch 'MDL-72589_311' of https://github.com/stronk7/moodle int…
Browse files Browse the repository at this point in the history
…o MOODLE_311_STABLE
  • Loading branch information
junpataleta committed Sep 16, 2021
2 parents 8d080e0 + 3671f19 commit 5795f1b
Show file tree
Hide file tree
Showing 13 changed files with 29 additions and 29 deletions.
Expand Up @@ -6,8 +6,8 @@ Feature: availability_group

Background:
Given the following "courses" exist:
| fullname | shortname | format | enablecompletion |
| Course 1 | C1 | topics | 1 |
| fullname | shortname | format | enablecompletion | numsections |
| Course 1 | C1 | topics | 1 | 3 |
And the following "users" exist:
| username |
| teacher1 |
Expand Down
6 changes: 3 additions & 3 deletions cohort/tests/behat/access_visible_cohorts.feature
Expand Up @@ -44,7 +44,7 @@ Feature: Access visible and hidden cohorts
| user | course | role |
| teacher | C1 | editingteacher |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Teacher can see visible cohorts defined in the above contexts
When I log in as "teacher"
And I am on "Course 1" course homepage
Expand Down Expand Up @@ -74,7 +74,7 @@ Feature: Access visible and hidden cohorts
And the "Select members from cohort" select box should not contain "Cohort empty in category 1"
And the "Select members from cohort" select box should not contain "System empty cohort"

@javascript
@javascript @skip_chrome_zerosize
Scenario: System manager can see all cohorts defined in the above contexts
When I log in as "user1"
And I am on "Course 1" course homepage
Expand Down Expand Up @@ -103,7 +103,7 @@ Feature: Access visible and hidden cohorts
And the "Select members from cohort" select box should not contain "Cohort empty in category 1"
And the "Select members from cohort" select box should not contain "System empty cohort"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Category manager can see all cohorts defined in his category and visible cohorts defined above
When I log in as "user2"
And I am on "Course 1" course homepage
Expand Down
2 changes: 1 addition & 1 deletion cohort/tests/behat/upload_cohort_users.feature
Expand Up @@ -4,7 +4,7 @@ Feature: Upload users to a cohort
As an admin
I need to upload a file with users data containing cohort assigns

@javascript
@javascript @skip_chrome_zerosize
Scenario: Upload users and assign them to a course with cohort enrolment method enabled
Given the following "cohorts" exist:
| name | idnumber |
Expand Down
2 changes: 1 addition & 1 deletion course/tests/behat/restrict_available_activities.feature
Expand Up @@ -28,7 +28,7 @@ Feature: Restrict activities availability
Then I should see "Test glossary name"
And I should see "Test chat name"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Activities can not be added when the admin restricts the permissions
Given I log in as "admin"
And I set the following system permissions of "Teacher" role:
Expand Down
2 changes: 1 addition & 1 deletion grade/report/grader/tests/behat/switch_views.feature
Expand Up @@ -78,7 +78,7 @@ Feature: We can change what we are viewing on the grader report
| -1- | -4- | -5- |
| Student 1 | 80 | 90 |

@javascript
@javascript @skip_chrome_zerosize
Scenario: View and minimise the grader report containing hidden activities without the 'moodle/grade:viewhidden' capability
When I am on "Course 1" course homepage with editing mode on
And I open "Test assignment name 2" actions menu
Expand Down
20 changes: 10 additions & 10 deletions grade/tests/behat/grade_calculated_weights.feature
Expand Up @@ -57,7 +57,7 @@ Feature: We can understand the gradebook user report
And I click on "Move" "link" in the "EN Test assignment four" "table_row"
And I click on "Move to here" "link" in the "//tbody//tr[position()=last()-3]" "xpath_element"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Mean of grades aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Mean of grades |
Expand All @@ -74,7 +74,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 5.83 % |
| EN Test assignment six | 33.33 % | 30.00 | 2.50 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Weighted mean of grades aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Weighted mean of grades |
Expand All @@ -99,7 +99,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 4.67 % |
| EN Test assignment six | 33.33 % | 30.00 | 2.00 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Simple weighted mean of grades aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Simple weighted mean of grades |
Expand All @@ -120,7 +120,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 7.78 % |
| EN Test assignment six | 33.33 % | 30.00 | 3.33 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Mean of grades (with extra credits) aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Mean of grades (with extra credits) |
Expand All @@ -139,7 +139,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 7.78 % |
| EN Test assignment six | 33.33 % | 30.00 | 3.33 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Median of grades aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Median of grades |
Expand All @@ -156,7 +156,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 11.67 % |
| EN Test assignment six | 33.33 % | 30.00 | 5.00 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Lowest grade aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Lowest grade |
Expand All @@ -173,7 +173,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 0.00 % |
| EN Test assignment six | 33.33 % | 30.00 | 0.00 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Highest grade aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Highest grade |
Expand All @@ -190,7 +190,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 0.00 % |
| EN Test assignment six | 33.33 % | 30.00 | 0.00 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Mode of grades aggregation
And I set the following settings for grade item "Course 1":
| Aggregation | Mode of grades |
Expand All @@ -207,7 +207,7 @@ Feature: We can understand the gradebook user report
| EN Test assignment five | 33.33 % | 70.00 | 0.00 % |
| EN Test assignment six | 33.33 % | 30.00 | 0.00 % |

@javascript
@javascript @skip_chrome_zerosize
Scenario: View user report with mixed aggregation methods
And I set the following settings for grade item "Course 1":
| Aggregation | Natural |
Expand All @@ -230,7 +230,7 @@ Feature: We can understand the gradebook user report
| EN Sub category totalWeighted mean of grades. | 33.33 % | 36.67 | - |
| Course total | - | 156.67 | - |

@javascript
@javascript @skip_chrome_zerosize
Scenario: View user report with natural aggregation
And I set the following settings for grade item "EN Test assignment three":
| Extra credit | 1 |
Expand Down
2 changes: 1 addition & 1 deletion group/tests/behat/delete_groups.feature
Expand Up @@ -56,7 +56,7 @@ Feature: Automatic deletion of groups and groupings
And I press "Yes"
And I should not see "Grouping (with ID)"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Delete groups and groupings with and without ID numbers without the 'moodle/course:changeidnumber' capability
Given I log out
And I log in as "admin"
Expand Down
2 changes: 1 addition & 1 deletion group/tests/behat/update_groups.feature
Expand Up @@ -63,7 +63,7 @@ Feature: Automatic updating of groups and groupings
And I click on "Edit" "link" in the "Grouping (with ID) (updated)" "table_row"
And the field "idnumber" matches value "An ID (updated)"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Update groups and groupings with ID numbers without the 'moodle/course:changeidnumber' capability
Given I log out
And I log in as "admin"
Expand Down
6 changes: 3 additions & 3 deletions mod/assign/tests/behat/bulk_remove_submissions.feature
Expand Up @@ -22,7 +22,7 @@ Feature: Bulk remove submissions
| name | course | idnumber |
| Group 1 | C1 | G1 |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Bulk remove submissions should remove the data that was submitted
Given the following "activity" exists:
| activity | assign |
Expand Down Expand Up @@ -81,7 +81,7 @@ Feature: Bulk remove submissions
And I set the field "selectall" to "1"
Then I should not see "Remove submission" in the "Choose operation" "select"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Notification should be displayed when non-group users are selected for submission bulk removal
in separate group mode
Given the following "activity" exists:
Expand Down Expand Up @@ -116,7 +116,7 @@ Feature: Bulk remove submissions
And I should see "The submission of Student 1 cannot be removed"
And I should see "The submission of Student 2 cannot be removed"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Bulk remove submission when group users are added to the bulk
removing submissions process in separate group mode
Given the following "group members" exist:
Expand Down
6 changes: 3 additions & 3 deletions mod/assign/tests/behat/remove_submission.feature
Expand Up @@ -31,7 +31,7 @@ Feature: Remove a submission
| student1 | G1 |
| student2 | G1 |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Remove a submission should remove the data that was submitted
Given the following "activity" exists:
| activity | assign |
Expand All @@ -56,7 +56,7 @@ Feature: Remove a submission
And I am on the "Test assignment name" Activity page logged in as student1
And I should not see "I'm the student submission"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Remove a group submission should remove the data from all group members
Given the following "activity" exists:
| activity | assign |
Expand All @@ -82,7 +82,7 @@ Feature: Remove a submission
And I am on the "Test assignment name" Activity page logged in as student2
And I should not see "I'm the student submission"

@javascript
@javascript @skip_chrome_zerosize
Scenario: A student can remove their own submission
Given the following "activity" exists:
| activity | assign |
Expand Down
2 changes: 1 addition & 1 deletion mod/quiz/tests/behat/add_quiz.feature
Expand Up @@ -44,7 +44,7 @@ Feature: Add a quiz
And I should see "Answer saved"
And I press "Submit all and finish"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Add and configure small quiz and perform an attempt as a student with Javascript enabled
Then I click on "Submit all and finish" "button" in the "Confirmation" "dialogue"
And I should see "So you think it is true"
Expand Down
2 changes: 1 addition & 1 deletion user/tests/behat/enrol_cohort_list.feature
Expand Up @@ -15,7 +15,7 @@ Feature: Viewing the list of cohorts to enrol in a course
| user | course | role |
| teacher1 | C1 | editingteacher |

@javascript
@javascript @skip_chrome_zerosize
Scenario: Check the teacher does not see the cohorts field without the proper capabilities
Given the following "cohort" exists:
| name | Test cohort name |
Expand Down
2 changes: 1 addition & 1 deletion user/tests/behat/filter_participants.feature
Expand Up @@ -730,7 +730,7 @@ Feature: Course participants can be filtered

Then I should see "Nothing to display"

@javascript
@javascript @skip_chrome_zerosize
Scenario: Filter by user identity fields when cannot see the field data
Given I log in as "admin"
And I set the following system permissions of "Teacher" role:
Expand Down

0 comments on commit 5795f1b

Please sign in to comment.