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

Merge branch 'MDL-71518-master' of git://github.com/rezaies/moodle

Browse source
This commit is contained in:
Jun Pataleta 2021-05-06 11:38:48 +08:00
commit 5891fb1352
8 changed files with 31 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

14
mod/assign/tests/behat/assign_group_override.feature
View file

@ -93,12 +93,12 @@ Feature: Assign group override
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
Then the activity date in "Test assignment name" should contain "Due: Saturday, 1 January 2000, 8:00 AM"
Then the activity date in "Test assignment name" should contain "Due: Saturday, 1 January 2000, 8:00"
And I log out
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And the activity date in "Test assignment name" should contain "Due: Wednesday, 1 January 2020, 8:00 AM"
And the activity date in "Test assignment name" should contain "Due: Wednesday, 1 January 2020, 8:00"
Scenario: Allow a group to have a different cut off date
Given I log in as "teacher1"
@ -149,13 +149,13 @@ Feature: Assign group override
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
Then the activity date in "Test assignment name" should contain "Opens: Tuesday, 1 January 2030, 8:00 AM"
Then the activity date in "Test assignment name" should contain "Opens: Tuesday, 1 January 2030, 8:00"
And I should not see "Add submission"
And I log out
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And I should not see "Tuesday, 1 January 2030, 8:00 AM"
And I should not see "Tuesday, 1 January 2030, 8:00"
@javascript
Scenario: Add both a user and group override and verify that both are applied correctly
@ -187,17 +187,17 @@ Feature: Assign group override
Then I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And the activity date in "Test assignment name" should contain "Opens: Wednesday, 1 January 2031, 8:00 AM"
And the activity date in "Test assignment name" should contain "Opens: Wednesday, 1 January 2031, 8:00"
And I log out
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And the activity date in "Test assignment name" should contain "Opens: Sunday, 1 January 2040, 8:00 AM"
And the activity date in "Test assignment name" should contain "Opens: Sunday, 1 January 2040, 8:00"
And I log out
And I log in as "student3"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And the activity date in "Test assignment name" should contain "Opens: Tuesday, 1 January 2030, 8:00 AM"
And the activity date in "Test assignment name" should contain "Opens: Tuesday, 1 January 2030, 8:00"
Scenario: Override a group when teacher is in no group, and does not have accessallgroups permission, and the activity's group mode is "separate groups"
Given the following "permission overrides" exist:

8
mod/assign/tests/behat/assign_user_override.feature
View file

@ -85,12 +85,12 @@ Feature: Assign user override
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
Then the activity date in "Test assignment name" should contain "Due: Saturday, 1 January 2000, 8:00 AM"
Then the activity date in "Test assignment name" should contain "Due: Saturday, 1 January 2000, 8:00"
And I log out
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And the activity date in "Test assignment name" should contain "Due: Wednesday, 1 January 2020, 8:00 AM"
And the activity date in "Test assignment name" should contain "Due: Wednesday, 1 January 2020, 8:00"
@javascript
Scenario: Allow a user to have a different cut off date
@ -143,12 +143,12 @@ Feature: Assign user override
And I log in as "student2"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
Then the activity date in "Test assignment name" should contain "Opens: Tuesday, 1 January 2030, 8:00 AM"
Then the activity date in "Test assignment name" should contain "Opens: Tuesday, 1 January 2030, 8:00"
And I log out
And I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
And I should not see "1 January 2030, 8:00 AM"
And I should not see "1 January 2030, 8:00"
Scenario: Override a user when teacher is in no group, and does not have accessallgroups permission, and the activity's group mode is "separate groups"
Given the following "permission overrides" exist:

2
mod/assign/tests/behat/relative_dates.feature
View file

@ -56,7 +56,7 @@ I should be able to create an assignment with a due date relative to the course
When I log in as "student1"
And I am on "Course 1" course homepage
And I follow "Test assignment name"
Then the activity date in "Test assignment name" should contain "Due: Thursday, 7 January 2021, 8:00 AM"
Then the activity date in "Test assignment name" should contain "Due: Thursday, 7 January 2021, 8:00"
Scenario: As a teacher, I should see the relative dates when reviewing assignment submissions
Given the following config values are set as admin:

2
mod/assign/tests/behat/set_availability.feature
View file

@ -44,7 +44,7 @@ Feature: Set availability dates for an assignment
When I follow "Assignment name"
Then "Add submission" "button" should not exist
And the activity date in "Assignment name" should contain "Opens:"
And the activity date in "Assignment name" should contain "##tomorrow noon##%A, %d %B %Y, %I:%M %p##"
And the activity date in "Assignment name" should contain "##tomorrow noon##%A, %d %B %Y, %I:%M##"
Scenario: Student can see the assignment's due date in the course calendar
Given I log in as "teacher1"