diff --git a/admin/tool/behat/tests/behat/data_generators.feature b/admin/tool/behat/tests/behat/data_generators.feature index 19afbe449b4..fbf03e28371 100644 --- a/admin/tool/behat/tests/behat/data_generators.feature +++ b/admin/tool/behat/tests/behat/data_generators.feature @@ -100,8 +100,7 @@ Feature: Set up contextual data for tests And the following "course enrolments" exist: | user | course | role | | student1 | C1 | student | - When I log in as "student1" - And I am on "Course 1" course homepage + When I am on the "Course 1" course page logged in as student1 Then I should see "Topic 1" Scenario: Add role assigns @@ -135,17 +134,11 @@ Feature: Set up contextual data for tests When I log in as "user1" And I am on site homepage Then edit mode should be available on the current page - And I log out - And I log in as "user2" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as user2 Then edit mode should be available on the current page - And I log out - And I log in as "user3" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as user3 Then edit mode should be available on the current page - And I log out - And I log in as "user4" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as user4 Then edit mode should be available on the current page And I log out And I log in as "user5" @@ -186,8 +179,7 @@ Feature: Set up contextual data for tests And the following "activities" exist: | activity | name | intro | course | idnumber | grade | | assign | Test assignment name with scale | Test assignment description | C1 | assign1 | Test Scale 1 | - When I log in as "admin" - And I am on "Course 1" course homepage + When I am on the "Course 1" course page logged in as admin Then I should see "Test assignment name" # Assignment 2.2 module type is disabled by default # And I should see "Test assignment22 name" @@ -303,9 +295,7 @@ Feature: Set up contextual data for tests And the following "grade categories" exist: | fullname | course | gradecategory | | Grade sub category 2 | C1 | Grade category 1 | - When I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page logged in as "admin" Then I should see "Grade category 1" And I should see "Grade sub category 2" @@ -326,9 +316,7 @@ Feature: Set up contextual data for tests | itemname | course | gradecategory | | Test Grade Item 2 | C1 | Grade category 1 | | Test Grade Item 3 | C1 | Grade sub category 2 | - When I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin" Then I should see "Test Grade Item 1" And I click on grade item menu "Test Grade Item 1" of type "gradeitem" on "setup" page And I choose "Edit grade item" in the open action menu @@ -357,9 +345,7 @@ Feature: Set up contextual data for tests And the following "scales" exist: | name | scale | | Test Scale 1 | Disappointing, Good, Very good, Excellent | - When I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "Scales" in the course gradebook + When I am on the "Course 1" "grades > scales" page logged in as admin Then I should see "Test Scale 1" And I should see "Disappointing, Good, Very good, Excellent" @@ -378,9 +364,7 @@ Feature: Set up contextual data for tests | Grade outcome 2 | OT2 | C1 | Test Scale 1 | And the following config values are set as admin: | enableoutcomes | 1 | - When I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "More > Outcomes" in the course gradebook + When I am on the "Course 1" "grades > outcomes" page logged in as admin Then I should see "Grade outcome 1" in the "#addoutcomes" "css_element" And I should see "Grade outcome 2" in the "#removeoutcomes" "css_element" And I press "Manage outcomes" @@ -406,9 +390,7 @@ Feature: Set up contextual data for tests | Test Outcome Grade Item 1 | C1 | OT1 | Grade category 1 | And the following config values are set as admin: | enableoutcomes | 1 | - When I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + When I am on the "Course 1" "grades > gradebook setup" page logged in as "admin" Then I should see "Test Outcome Grade Item 1" And I click on grade item menu "Test Outcome Grade Item 1" of type "gradeitem" on "setup" page And I choose "Edit grade item" in the open action menu @@ -424,6 +406,5 @@ Feature: Set up contextual data for tests And the following "blocks" exist: | blockname | contextlevel | reference | pagetypepattern | defaultregion | | online_users | Course | C1 | course-view-* | site-pre | - When I log in as "admin" - And I am on "Course 1" course homepage + When I am on the "Course 1" course page logged in as admin Then I should see "Online users" diff --git a/admin/tool/recyclebin/tests/behat/backup_user_data.feature b/admin/tool/recyclebin/tests/behat/backup_user_data.feature index b6012e84eef..0eccc5944df 100644 --- a/admin/tool/recyclebin/tests/behat/backup_user_data.feature +++ b/admin/tool/recyclebin/tests/behat/backup_user_data.feature @@ -54,10 +54,7 @@ Feature: Backup user data And I navigate to "Recycle bin" in current page administration And I should see "Quiz 1" And I click on "Restore" "link" in the "region-main" "region" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - When I navigate to "User report" in the course gradebook + When I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then "Quiz 1" row "Grade" column of "user-grade" table should contain "50" And "Quiz 1" row "Percentage" column of "user-grade" table should contain "50" diff --git a/blocks/activity_results/tests/behat/addblockinactivity.feature b/blocks/activity_results/tests/behat/addblockinactivity.feature index f0c4e579e9d..4b34050c6f2 100644 --- a/blocks/activity_results/tests/behat/addblockinactivity.feature +++ b/blocks/activity_results/tests/behat/addblockinactivity.feature @@ -32,18 +32,15 @@ Feature: The activity results block displays student scores And the following "activities" exist: | activity | name | content | course | section | idnumber | | page | Test page name | This is a page | C1 | 1 | page1 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment 1 | student1 | 90.00 | + | Test assignment 1 | student2 | 80.00 | + | Test assignment 1 | student3 | 70.00 | + | Test assignment 1 | student4 | 60.00 | + | Test assignment 1 | student5 | 50.00 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I should see "Test page name" - And I navigate to "View > Grader report" in the course gradebook - And I change window size to "large" - And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment 1" - And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment 1" - And I give the grade "70.00" to the user "Student 3" for the grade item "Test assignment 1" - And I give the grade "60.00" to the user "Student 4" for the grade item "Test assignment 1" - And I give the grade "50.00" to the user "Student 5" for the grade item "Test assignment 1" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on a non-graded activity to show 3 high scores Given I am on the "Test page name" "page activity" page diff --git a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature index d16005a59a6..efe733e6d01 100644 --- a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature @@ -27,16 +27,15 @@ Feature: The activity results block displays student high scores And the following "activities" exist: | activity | name | intro | course | section | idnumber | assignsubmission_file_enabled | | assign | Test assignment | Offline text | C1 | 1 | assign1 | 0 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment | student1 | 90.00 | + | Test assignment | student2 | 80.00 | + | Test assignment | student3 | 70.00 | + | Test assignment | student4 | 60.00 | + | Test assignment | student5 | 50.00 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I navigate to "View > Grader report" in the course gradebook - And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment" - And I give the grade "70.00" to the user "Student 3" for the grade item "Test assignment" - And I give the grade "60.00" to the user "Student 4" for the grade item "Test assignment" - And I give the grade "50.00" to the user "Student 5" for the grade item "Test assignment" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on the course page to show 0 high scores Given I add the "Activity results" block to the default region with: diff --git a/blocks/activity_results/tests/behat/highscoreswithscales.feature b/blocks/activity_results/tests/behat/highscoreswithscales.feature index 493ec00d2c9..a0aedb678a6 100644 --- a/blocks/activity_results/tests/behat/highscoreswithscales.feature +++ b/blocks/activity_results/tests/behat/highscoreswithscales.feature @@ -31,23 +31,15 @@ Feature: The activity results block displays students high scores in group as sc | name | Test assignment | | intro | Offline text | | assignsubmission_file_enabled | 0 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Scales" in the course gradebook - And I press "Add a new scale" - And I set the following fields to these values: - | Name | My Scale | - | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | - And I press "Save changes" - And I am on "Course 1" course homepage - And I follow "Test assignment" - And I navigate to "Settings" in current page administration + And the following "scales" exist: + | name | scale | + | My Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | + And I am on the "Test assignment" "assign activity editing" page logged in as teacher1 And I set the following fields to these values: | id_grade_modgrade_type | Scale | | id_grade_modgrade_scale | My Scale | And I press "Save and return to course" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 1" "grades > Grader report > View" page And I turn editing mode on And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 2" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature index 0713734e817..e367b8d1462 100644 --- a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature @@ -44,26 +44,19 @@ Feature: The activity results block displays student in group high scores as sca And the following "activities" exist: | activity | name | intro | course | section | idnumber | | assign | Test assignment | Offline text | C1 | 1 | assign1 | + And the following "scales" exist: + | name | scale | + | My Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | And I change window size to "large" - And I log in as "teacher1" - And I am on "Course 1" course homepage with editing mode on - And I navigate to "Scales" in the course gradebook - And I press "Add a new scale" - And I set the following fields to these values: - | Name | My Scale | - | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | - And I press "Save changes" - And I am on "Course 1" course homepage - And I am on the "Test assignment" "assign activity" page - And I navigate to "Settings" in current page administration + And I am on the "Test assignment" "assign activity editing" page logged in as teacher1 And I set the following fields to these values: | assignsubmission_file_enabled | 0 | | id_grade_modgrade_type | Scale | | id_grade_modgrade_scale | My Scale | | Group mode | Separate groups | And I press "Save and return to course" - 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 am on the "Course 1" "grades > Grader report > View" page And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 2" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 3" for the grade item "Test assignment" @@ -81,9 +74,7 @@ Feature: The activity results block displays student in group high scores as sca | config_usegroups | Yes | Then I should see "Group 1" in the "Activity results" "block" And I should see "Excellent!" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "Student 1" in the "Activity results" "block" And I should see "Excellent!" in the "Activity results" "block" @@ -99,9 +90,7 @@ Feature: The activity results block displays student in group high scores as sca And I should see "Very good" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - 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 I should see "Student 3" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" And I should see "Student 4" in the "Activity results" "block" @@ -119,10 +108,8 @@ Feature: The activity results block displays student in group high scores as sca And I should see "Excellent!" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - And I log out # Students cannot see user identity fields. - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "User" in the "Activity results" "block" And I should not see "User S1" in the "Activity results" "block" And I should see "Excellent!" in the "Activity results" "block" @@ -139,9 +126,7 @@ Feature: The activity results block displays student in group high scores as sca And I should see "Excellent!" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "User" in the "Activity results" "block" And I should see "Excellent!" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" diff --git a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature index a0c854d458f..2d67f7ac70e 100644 --- a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature @@ -46,21 +46,19 @@ Feature: The activity results block displays student in separate groups scores | course | C1 | | idnumber | 0001 | | name | Test assignment | - | intro | Offline text | | section | 1 | | assignsubmission_file_enabled | 0 | | groupmode | 1 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment | student1 | 100.00 | + | Test assignment | student2 | 90.00 | + | Test assignment | student3 | 90.00 | + | Test assignment | student4 | 80.00 | + | Test assignment | student5 | 80.00 | + | Test assignment | student6 | 70.00 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I navigate to "View > Grader report" in the course gradebook - And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 4" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment" - And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on the course page to show 1 high score Given I add the "Activity results" block to the default region with: @@ -82,9 +80,7 @@ Feature: The activity results block displays student in separate groups scores | config_usegroups | Yes | Then I should see "Group 1" in the "Activity results" "block" And I should see "95.00/100.00" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "Student 1" in the "Activity results" "block" And I should see "100.00/100.00" in the "Activity results" "block" @@ -97,9 +93,7 @@ Feature: The activity results block displays student in separate groups scores | config_usegroups | Yes | Then I should see "Group 1" in the "Activity results" "block" And I should see "95.00" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "Student 1" in the "Activity results" "block" And I should see "100.00" in the "Activity results" "block" @@ -117,9 +111,7 @@ Feature: The activity results block displays student in separate groups scores And I should see "85%" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75%" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "Student 1" in the "Activity results" "block" And I should see "100%" in the "Activity results" "block" And I should see "Student 2" in the "Activity results" "block" @@ -138,9 +130,7 @@ Feature: The activity results block displays student in separate groups scores And I should see "85.00/100.00" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75.00/100.00" in the "Activity results" "block" - 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 I should see "Student 3" in the "Activity results" "block" And I should see "90.00/100.00" in the "Activity results" "block" And I should see "Student 4" in the "Activity results" "block" @@ -159,9 +149,7 @@ Feature: The activity results block displays student in separate groups scores And I should see "85.00" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75.00" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "Student 1" in the "Activity results" "block" And I should see "100.00" in the "Activity results" "block" And I should see "Student 2" in the "Activity results" "block" @@ -180,10 +168,8 @@ Feature: The activity results block displays student in separate groups scores And I should see "95.00%" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" And I should see "75.00%" in the "Activity results" "block" - And I log out # Students cannot see user identity fields. - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "User" in the "Activity results" "block" And I should not see "User S1" in the "Activity results" "block" And I should see "100.00%" in the "Activity results" "block" @@ -201,9 +187,7 @@ Feature: The activity results block displays student in separate groups scores And I should see "95.00%" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" And I should see "75.00%" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "User" in the "Activity results" "block" And I should see "100.00%" in the "Activity results" "block" And I should see "90.00%" in the "Activity results" "block" diff --git a/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature b/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature index ee396e360fe..b27853996aa 100644 --- a/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature +++ b/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature @@ -42,26 +42,18 @@ Feature: The activity results block displays student in visible groups scores | student5 | G3 | | student6 | G3 | And the following "activities" exist: - | activity | name | intro | course | idnumber | section | assignsubmission_file_enabled | - | assign | Test assignment | Test assignment | C1 | assign1 | 1 | 0 | - And I log in as "teacher1" - And I am on "Course 1" course homepage with editing mode on - And I am on the "Test assignment" "assign activity" page - And I navigate to "Settings" in current page administration - And I set the following fields to these values: - | Group mode | Visible groups | - And I press "Save and return to course" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + | activity | name | course | idnumber | section | assignsubmission_file_enabled | groupmode | + | assign | Test assignment | C1 | assign1 | 1 | 0 | 2 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment | student1 | 100.00 | + | Test assignment | student2 | 90.00 | + | Test assignment | student3 | 90.00 | + | Test assignment | student4 | 80.00 | + | Test assignment | student5 | 80.00 | + | Test assignment | student6 | 70.00 | + And I am on the "Course 1" course page logged in as teacher1 And I turn editing mode on - And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 4" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment" - And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on the course page to show 1 high score Given I add the "Activity results" block to the default region with: @@ -81,10 +73,8 @@ Feature: The activity results block displays student in visible groups scores | config_gradeformat | Fractions | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage - And I should see "Group 1" in the "Activity results" "block" + And I am on the "Course 1" course page logged in as student1 + Then I should see "Group 1" in the "Activity results" "block" And I should see "95.00/100.00" in the "Activity results" "block" Scenario: Try to configure the block on the course page to show 1 high score as a absolute numbers @@ -94,9 +84,7 @@ Feature: The activity results block displays student in visible groups scores | config_gradeformat | Absolute numbers | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 1" in the "Activity results" "block" And I should see "95.00" in the "Activity results" "block" @@ -108,9 +96,7 @@ Feature: The activity results block displays student in visible groups scores | config_nameformat | Display full names | | config_decimalpoints | 0 | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 1" in the "Activity results" "block" And I should see "95%" in the "Activity results" "block" And I should see "Group 2" in the "Activity results" "block" @@ -125,9 +111,7 @@ Feature: The activity results block displays student in visible groups scores | config_gradeformat | Fractions | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 1" in the "Activity results" "block" And I should see "95.00/100.00" in the "Activity results" "block" And I should see "Group 2" in the "Activity results" "block" @@ -142,9 +126,7 @@ Feature: The activity results block displays student in visible groups scores | config_gradeformat | Absolute numbers | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 1" in the "Activity results" "block" And I should see "95.00" in the "Activity results" "block" And I should see "Group 2" in the "Activity results" "block" @@ -161,9 +143,7 @@ Feature: The activity results block displays student in visible groups scores | config_gradeformat | Percentages | | config_nameformat | Display only ID numbers | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group" in the "Activity results" "block" And I should see "95.00%" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" @@ -176,9 +156,7 @@ Feature: The activity results block displays student in visible groups scores | config_gradeformat | Percentages | | config_nameformat | Anonymous results | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group" in the "Activity results" "block" And I should see "95.00%" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" diff --git a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature index 2b7a95d2646..1a23ffd8895 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature @@ -29,19 +29,16 @@ Feature: The activity results block displays student low scores | course | C1 | | idnumber | 0001 | | name | Test assignment | - | intro | Offline text | - | section | 1 | | assignsubmission_file_enabled | 0 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment | student1 | 90.00 | + | Test assignment | student2 | 80.00 | + | Test assignment | student3 | 70.00 | + | Test assignment | student4 | 60.00 | + | Test assignment | student5 | 50.00 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I navigate to "View > Grader report" in the course gradebook - And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 2" for the grade item "Test assignment" - And I give the grade "70.00" to the user "Student 3" for the grade item "Test assignment" - And I give the grade "60.00" to the user "Student 4" for the grade item "Test assignment" - And I give the grade "50.00" to the user "Student 5" for the grade item "Test assignment" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on the course page to show 1 low score Given I add the "Activity results" block to the default region with: diff --git a/blocks/activity_results/tests/behat/lowscoreswithscales.feature b/blocks/activity_results/tests/behat/lowscoreswithscales.feature index 95efff20f6f..daa15822469 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithscales.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithscales.feature @@ -32,23 +32,16 @@ Feature: The activity results block displays student low scores as scales | idnumber | 0001 | | section | 1 | | assignsubmission_file_enabled | 0 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Scales" in the course gradebook - And I press "Add a new scale" - And I set the following fields to these values: - | Name | My Scale | - | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | - And I press "Save changes" - And I am on "Course 1" course homepage with editing mode on - And I am on the "Test assignment" "assign activity" page - And I navigate to "Settings" in current page administration + And the following "scales" exist: + | name | scale | + | My Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | + And I am on the "Test assignment" "assign activity editing" page logged in as teacher1 And I set the following fields to these values: | id_grade_modgrade_type | Scale | | id_grade_modgrade_scale | My Scale | And I press "Save and return to course" - 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 am on the "Course 1" "grades > Grader report > View" page And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 2" for the grade item "Test assignment" And I give the grade "Good" to the user "Student 3" for the grade item "Test assignment" diff --git a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature index 67c711eda83..77a109d63ee 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature @@ -49,24 +49,16 @@ Feature: The activity results block displays students in groups low scores as sc | description | Offline text | | assignsubmission_file_enabled | 0 | | groupmode | 1 | + And the following "scales" exist: + | name | scale | + | My Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | And I change window size to "large" - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Scales" in the course gradebook - And I press "Add a new scale" - And I set the following fields to these values: - | Name | My Scale | - | Scale | Disappointing, Not good enough, Average, Good, Very good, Excellent! | - And I press "Save changes" - And I am on "Course 1" course homepage - And I follow "Test assignment" - And I navigate to "Settings" in current page administration + And I am on the "Test assignment" "assign activity editing" page logged in as teacher1 And I set the following fields to these values: | id_grade_modgrade_type | Scale | | id_grade_modgrade_scale | My Scale | And I press "Save and return to course" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 1" "grades > Grader report > View" page And I turn editing mode on And I give the grade "Excellent!" to the user "Student 1" for the grade item "Test assignment" And I give the grade "Very good" to the user "Student 2" for the grade item "Test assignment" @@ -85,9 +77,7 @@ Feature: The activity results block displays students in groups low scores as sc | config_usegroups | Yes | Then I should see "Group 3" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "Student 6" in the "Activity results" "block" And I should see "Average" in the "Activity results" "block" @@ -101,9 +91,7 @@ Feature: The activity results block displays students in groups low scores as sc And I should see "Very good" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - 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 I should see "Student 3" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" And I should see "Student 4" in the "Activity results" "block" @@ -120,10 +108,8 @@ Feature: The activity results block displays students in groups low scores as sc Then I should see "Group" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - And I log out # Students cannot see user identity fields. - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "User" in the "Activity results" "block" And I should not see "User S5" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" @@ -139,9 +125,7 @@ Feature: The activity results block displays students in groups low scores as sc Then I should see "Group" in the "Activity results" "block" And I should see "Very good" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "User" in the "Activity results" "block" And I should see "Good" in the "Activity results" "block" And I should see "Average" in the "Activity results" "block" diff --git a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature index b9f4ef7300d..86f62375127 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature @@ -42,19 +42,18 @@ Feature: The activity results block displays students in separate groups scores | student5 | G3 | | student6 | G3 | And the following "activities" exist: - | activity | course | idnumber | name | intro | assignsubmission_file_enabled | groupmode | - | assign | C1 | a1 | Test assignment | Offline text | 0 | 1 | + | activity | course | idnumber | name | assignsubmission_file_enabled | groupmode | + | assign | C1 | a1 | Test assignment | 0 | 1 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment | student1 | 100.00 | + | Test assignment | student2 | 90.00 | + | Test assignment | student3 | 90.00 | + | Test assignment | student4 | 80.00 | + | Test assignment | student5 | 80.00 | + | Test assignment | student6 | 70.00 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I navigate to "View > Grader report" in the course gradebook - And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 4" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment" - And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on the course page to show 1 low score Given I add the "Activity results" block to the default region with: @@ -76,9 +75,7 @@ Feature: The activity results block displays students in separate groups scores | config_usegroups | Yes | Then I should see "Group 3" in the "Activity results" "block" And I should see "75.00/100.00" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "Student 6" in the "Activity results" "block" And I should see "70.00/100.00" in the "Activity results" "block" @@ -91,9 +88,7 @@ Feature: The activity results block displays students in separate groups scores | config_usegroups | Yes | Then I should see "Group 3" in the "Activity results" "block" And I should see "75.00" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "Student 6" in the "Activity results" "block" And I should see "70.00" in the "Activity results" "block" @@ -109,9 +104,7 @@ Feature: The activity results block displays students in separate groups scores And I should see "85%" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75%" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "Student 6" in the "Activity results" "block" And I should see "70%" in the "Activity results" "block" And I should see "Student 5" in the "Activity results" "block" @@ -128,9 +121,7 @@ Feature: The activity results block displays students in separate groups scores And I should see "85.00/100.00" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75.00/100.00" in the "Activity results" "block" - 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 I should see "Student 3" in the "Activity results" "block" And I should see "90.00/100.00" in the "Activity results" "block" And I should see "Student 4" in the "Activity results" "block" @@ -147,9 +138,7 @@ Feature: The activity results block displays students in separate groups scores And I should see "85.00" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75.00" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 And I should see "Student 5" in the "Activity results" "block" And I should see "80.00" in the "Activity results" "block" And I should see "Student 6" in the "Activity results" "block" @@ -167,10 +156,8 @@ Feature: The activity results block displays students in separate groups scores Then I should see "Group" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" And I should see "75.00%" in the "Activity results" "block" - And I log out # Students cannot see user identity fields. - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "User" in the "Activity results" "block" And I should not see "User S1" in the "Activity results" "block" And I should see "100.00%" in the "Activity results" "block" @@ -187,9 +174,7 @@ Feature: The activity results block displays students in separate groups scores Then I should see "Group" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" And I should see "75.00%" in the "Activity results" "block" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student1 And I should see "User" in the "Activity results" "block" And I should see "100.00%" in the "Activity results" "block" And I should see "90.00%" in the "Activity results" "block" diff --git a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature index cb9a3a52772..e1a86164419 100644 --- a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature +++ b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature @@ -46,21 +46,18 @@ Feature: The activity results block displays student in visible groups low score | course | C1 | | idnumber | 0001 | | name | Test assignment | - | intro | Offline text | - | section | 1 | | assignsubmission_file_enabled | 0 | | groupmode | 2 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment | student1 | 100.00 | + | Test assignment | student2 | 90.00 | + | Test assignment | student3 | 90.00 | + | Test assignment | student4 | 80.00 | + | Test assignment | student5 | 80.00 | + | Test assignment | student6 | 70.00 | And I log in as "teacher1" And I am on "Course 1" course homepage with editing mode on - And I navigate to "View > Grader report" in the course gradebook - And I give the grade "100.00" to the user "Student 1" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 2" for the grade item "Test assignment" - And I give the grade "90.00" to the user "Student 3" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 4" for the grade item "Test assignment" - And I give the grade "80.00" to the user "Student 5" for the grade item "Test assignment" - And I give the grade "70.00" to the user "Student 6" for the grade item "Test assignment" - And I press "Save changes" - And I am on "Course 1" course homepage Scenario: Configure the block on the course page to show 1 low score Given I add the "Activity results" block to the default region with: @@ -80,9 +77,7 @@ Feature: The activity results block displays student in visible groups low score | config_gradeformat | Fractions | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 3" in the "Activity results" "block" And I should see "75.00/100.00" in the "Activity results" "block" @@ -93,10 +88,8 @@ Feature: The activity results block displays student in visible groups low score | config_gradeformat | Absolute numbers | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage - And I should see "Group 3" in the "Activity results" "block" + When I am on the "Course 1" course page logged in as student1 + Then I should see "Group 3" in the "Activity results" "block" And I should see "75.00" in the "Activity results" "block" Scenario: Try to configure the block on the course page to show multiple low scores as percentages @@ -111,9 +104,7 @@ Feature: The activity results block displays student in visible groups low score And I should see "85%" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" And I should see "75%" in the "Activity results" "block" - And I log out - And I log in as "student5" - And I am on "Course 1" course homepage + And I am on the "Course 1" course page logged in as student5 Then I should see "Group 2" in the "Activity results" "block" And I should see "85%" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" @@ -126,9 +117,7 @@ Feature: The activity results block displays student in visible groups low score | config_gradeformat | Fractions | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 2" in the "Activity results" "block" And I should see "85.00/100.00" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" @@ -141,9 +130,7 @@ Feature: The activity results block displays student in visible groups low score | config_gradeformat | Absolute numbers | | config_nameformat | Display full names | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group 2" in the "Activity results" "block" And I should see "85.00" in the "Activity results" "block" And I should see "Group 3" in the "Activity results" "block" @@ -158,9 +145,7 @@ Feature: The activity results block displays student in visible groups low score | config_gradeformat | Percentages | | config_nameformat | Display only ID numbers | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" And I should see "75.00%" in the "Activity results" "block" @@ -172,9 +157,7 @@ Feature: The activity results block displays student in visible groups low score | config_gradeformat | Percentages | | config_nameformat | Anonymous results | | config_usegroups | Yes | - And I log out - Then I log in as "student1" - And I am on "Course 1" course homepage + Then I am on the "Course 1" course page logged in as student1 And I should see "Group" in the "Activity results" "block" And I should see "85.00%" in the "Activity results" "block" And I should see "75.00%" in the "Activity results" "block" diff --git a/completion/tests/behat/activity_completion_criteria.feature b/completion/tests/behat/activity_completion_criteria.feature index 2d25ad07dbf..5b7f173de18 100644 --- a/completion/tests/behat/activity_completion_criteria.feature +++ b/completion/tests/behat/activity_completion_criteria.feature @@ -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 diff --git a/completion/tests/behat/enable_completion_on_pass_grade.feature b/completion/tests/behat/enable_completion_on_pass_grade.feature index 10087f72ec1..cf9846663c4 100644 --- a/completion/tests/behat/enable_completion_on_pass_grade.feature +++ b/completion/tests/behat/enable_completion_on_pass_grade.feature @@ -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" diff --git a/completion/tests/behat/enable_completion_on_view_and_grade.feature b/completion/tests/behat/enable_completion_on_view_and_grade.feature index f762c49dd91..69e06a3f8c0 100644 --- a/completion/tests/behat/enable_completion_on_view_and_grade.feature +++ b/completion/tests/behat/enable_completion_on_view_and_grade.feature @@ -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" diff --git a/completion/tests/behat/passgrade_completion_criteria_gradeitem_visibility.feature b/completion/tests/behat/passgrade_completion_criteria_gradeitem_visibility.feature index 673d33b3fae..094ad1b8473 100644 --- a/completion/tests/behat/passgrade_completion_criteria_gradeitem_visibility.feature +++ b/completion/tests/behat/passgrade_completion_criteria_gradeitem_visibility.feature @@ -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" diff --git a/grade/export/txt/tests/behat/export.feature b/grade/export/txt/tests/behat/export.feature index 9ed149dced5..aadf1c629c0 100644 --- a/grade/export/txt/tests/behat/export.feature +++ b/grade/export/txt/tests/behat/export.feature @@ -20,13 +20,10 @@ Feature: I need to export grades as text | activity | course | idnumber | name | intro | assignsubmission_onlinetext_enabled | | assign | C1 | a1 | Test assignment name | Submit your online text | 1 | | assign | C1 | a2 | Test assignment name 2 | Submit your online text | 1 | - And 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 change window size to "large" - And I give the grade "80.00" to the user "Student 1" for the grade item "Test assignment name" - And I press "Save changes" + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment name | student1 | 80.00 | + And I am on the "Course 1" course page logged in as teacher1 @javascript Scenario: Export grades as text diff --git a/grade/export/xml/tests/behat/export.feature b/grade/export/xml/tests/behat/export.feature index 60308cf2dc9..de88363aaf5 100644 --- a/grade/export/xml/tests/behat/export.feature +++ b/grade/export/xml/tests/behat/export.feature @@ -19,15 +19,13 @@ Feature: I need to export grades as xml | student1 | C1 | student | | student2 | C1 | student | And the following "activities" exist: - | activity | course | idnumber | name | intro | - | assign | C1 | a1 | Test assignment name | Submit something! | - And 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 "80.00" to the user "Student 1" for the grade item "Test assignment name" - And I give the grade "42.00" to the user "Student 2" for the grade item "Test assignment name" - And I press "Save changes" + | activity | course | idnumber | name | + | assign | C1 | a1 | Test assignment name | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment name | student1 | 80.00 | + | Test assignment name | student2 | 42.00 | + And I am on the "Course 1" course page logged in as teacher1 @javascript Scenario: Export grades as XML diff --git a/grade/report/grader/tests/behat/column_collapsing.feature b/grade/report/grader/tests/behat/column_collapsing.feature index 7ee64ea8c82..42356945948 100644 --- a/grade/report/grader/tests/behat/column_collapsing.feature +++ b/grade/report/grader/tests/behat/column_collapsing.feature @@ -40,9 +40,7 @@ Feature: Within the grader report, test that we can collapse columns | assign | C1 | a4 | Test assignment four | And the following config values are set as admin: | showuseridentity | idnumber,email,city,country,phone1,phone2,department,institution,profile_field_enduro | - And I am on the "Course 1" "Course" page logged in as "teacher1" - And I change window size to "large" - 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" Scenario: An admin collapses a user info column and then reloads the page to find the column still collapsed Given I should see "Email" in the "First name / Last name" "table_row" @@ -55,7 +53,6 @@ Feature: Within the grader report, test that we can collapse columns When I reload the page Then I should not see "Email" in the "First name / Last name" "table_row" # Check that the collapsed column is only for the user that set it. - And I log out And I am on the "Course 1" "Course" page logged in as "admin" And I change window size to "large" And I navigate to "View > Grader report" in the course gradebook diff --git a/grade/report/grader/tests/behat/groupsearch.feature b/grade/report/grader/tests/behat/groupsearch.feature index 9b9186bf0fb..2b16f187471 100644 --- a/grade/report/grader/tests/behat/groupsearch.feature +++ b/grade/report/grader/tests/behat/groupsearch.feature @@ -24,9 +24,7 @@ Feature: Group searching functionality within the grader report. | user | group | | student1 | dg | | student2 | g2 | - And I am on the "C1" "Course" page logged in as "teacher1" - And I change window size to "large" - 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" Scenario: A teacher can see the 'group' search widget only when group mode is enabled in the course Given ".groupsearchwidget" "css_element" should exist diff --git a/grade/report/grader/tests/behat/switch_views.feature b/grade/report/grader/tests/behat/switch_views.feature index 505fc268fdc..8e39b1f7745 100644 --- a/grade/report/grader/tests/behat/switch_views.feature +++ b/grade/report/grader/tests/behat/switch_views.feature @@ -77,8 +77,7 @@ Feature: We can change what we are viewing on the grader report And the following "role capability" exists: | role | editingteacher | | moodle/grade:viewhidden | prevent | - And I am on the "C1" "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" Then I should see "Test assignment name 1" in the "user-grades" "table" And I should see "Test assignment name 2" in the "user-grades" "table" And I should see "Manual grade" diff --git a/grade/report/grader/tests/behat/tertiary_name_filter.feature b/grade/report/grader/tests/behat/tertiary_name_filter.feature index 5404046a25d..c7150694ed9 100644 --- a/grade/report/grader/tests/behat/tertiary_name_filter.feature +++ b/grade/report/grader/tests/behat/tertiary_name_filter.feature @@ -26,9 +26,7 @@ Feature: Within the grader report, test that we can open our generic filter drop And the following "activities" exist: | activity | course | idnumber | name | | assign | C1 | a1 | Test assignment one | - And I am on the "Course 1" "Course" page logged in as "teacher1" - And I change window size to "large" - 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" Scenario: A teacher can open the filter component Given I should see "Filter by name" diff --git a/grade/report/grader/tests/behat/tertiary_navigation_searching.feature b/grade/report/grader/tests/behat/tertiary_navigation_searching.feature index d726fa3c62d..d8bbda484c4 100644 --- a/grade/report/grader/tests/behat/tertiary_navigation_searching.feature +++ b/grade/report/grader/tests/behat/tertiary_navigation_searching.feature @@ -30,9 +30,7 @@ Feature: Within the grader report, test that we can search for users | assign | C1 | a1 | Test assignment one | And the following config values are set as admin: | showuseridentity | idnumber,email,city,country,phone1,phone2,department,institution | - And I am on the "Course 1" "Course" page logged in as "teacher1" - And I change window size to "large" - 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" Scenario: A teacher can view and trigger the user search # Check the placeholder text diff --git a/grade/report/history/tests/behat/basic_functionality.feature b/grade/report/history/tests/behat/basic_functionality.feature index d633f622bad..0889b4e176b 100644 --- a/grade/report/history/tests/behat/basic_functionality.feature +++ b/grade/report/history/tests/behat/basic_functionality.feature @@ -25,14 +25,12 @@ Feature: A teacher checks the grade history report in a course | student1 | C1 | student | | student2 | C1 | student | And the following "activities" exist: - | activity | course | section | name | intro | - | assign | C1 | 1 | The greatest assignment ever | Write a behat test for Moodle - it's amazing | - | assign | C1 | 1 | Rewarding assignment | After writing your behat test go grab a beer! | + | activity | course | name | + | assign | C1 | The greatest assignment ever | + | assign | C1 | Rewarding assignment | Given the following config values are set as admin: | showuseridentity | email,profile_field_food | - And I log in as "teacher1" - And I am on "Course 1" course homepage with editing mode on - 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 should see "apple" in the "student1" "table_row" And I should see "orange" in the "student2" "table_row" And I turn editing mode on @@ -41,10 +39,7 @@ Feature: A teacher checks the grade history report in a course And I give the grade "50.00" to the user "Student 2" for the grade item "The greatest assignment ever" And I give the grade "60.00" to the user "Student 2" for the grade item "Rewarding assignment" And I press "Save changes" - And I log out - And I log in as "teacher2" - And I am on "Course 1" course homepage - 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 "teacher2" And I should see "apple" in the "student1" "table_row" And I should see "orange" in the "student2" "table_row" And I turn editing mode on diff --git a/grade/report/singleview/tests/behat/gradeitemsearch.feature b/grade/report/singleview/tests/behat/gradeitemsearch.feature index 086d8168957..d40e1ea3371 100644 --- a/grade/report/singleview/tests/behat/gradeitemsearch.feature +++ b/grade/report/singleview/tests/behat/gradeitemsearch.feature @@ -16,11 +16,9 @@ Feature: Given we have opted to search for a grade item, Lets find and search th | activity | course | idnumber | name | | assign | C1 | a1 | Test assignment one | | assign | C1 | a2 | Test assignment two | - And I am on the "Course 1" "Course" page logged in as "teacher1" - And I change window size to "large" Scenario: A teacher can search for and find a grade item to view - Given I navigate to "View > Single view" in the course gradebook + Given I am on the "Course 1" "grades > Single view > View" page logged in as "teacher1" And I click on "Grade items" "link" in the ".page-toggler" "css_element" And I click on ".gradesearchwidget" "css_element" When I confirm "Test assignment one" in "grade" search within the gradebook widget exists diff --git a/grade/report/singleview/tests/behat/pagination.feature b/grade/report/singleview/tests/behat/pagination.feature index 32835381211..ffa3cb54e1b 100644 --- a/grade/report/singleview/tests/behat/pagination.feature +++ b/grade/report/singleview/tests/behat/pagination.feature @@ -28,8 +28,7 @@ Feature: Singleview report pagination | user | student[count] | | course | C1 | | role |student | - When I am on the "Course 1" "Course" page logged in as "teacher1" - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" And I click on grade item menu "Test assignment one" of type "gradeitem" on "grader" page And I choose "Single view for this item" in the open action menu Then the field "perpage" matches value "20" @@ -48,13 +47,11 @@ Feature: Singleview report pagination And the following "activities" exist: | activity | course | idnumber | name | intro | grade | | assign | C2 | a2 | Test assignment two | Submit something! | 300 | - When I am on the "Course 1" "Course" page logged in as "teacher1" - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" And I click on grade item menu "Test assignment one" of type "gradeitem" on "grader" page And I choose "Single view for this item" in the open action menu And I set the field "perpage" to "100" - And I am on the "Course 2" "Course" page - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 2" "grades > Grader report > View" page And I click on grade item menu "Test assignment two" of type "gradeitem" on "grader" page And I choose "Single view for this item" in the open action menu Then the field "perpage" matches value "100" @@ -69,8 +66,7 @@ Feature: Singleview report pagination | user | student[count] | | course | C1 | | role |student | - When I am on the "Course 1" "Course" page logged in as "teacher1" - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" And I click on grade item menu "Test assignment one" of type "gradeitem" on "grader" page And I choose "Single view for this item" in the open action menu And I set the field "perpage" to "100" @@ -90,8 +86,7 @@ Feature: Singleview report pagination | user | student[count] | | course | C1 | | role |student | - When I am on the "Course 1" "Course" page logged in as "teacher1" - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" And I click on grade item menu "Test assignment one" of type "gradeitem" on "grader" page And I choose "Single view for this item" in the open action menu # By default, we have 20 students per page. diff --git a/grade/report/singleview/tests/behat/reportswitching.feature b/grade/report/singleview/tests/behat/reportswitching.feature index e6243f4a2b6..176b946150b 100644 --- a/grade/report/singleview/tests/behat/reportswitching.feature +++ b/grade/report/singleview/tests/behat/reportswitching.feature @@ -15,11 +15,9 @@ Feature: Given we land on the index page, select what type of report we wish to And the following "activities" exist: | activity | course | idnumber | name | | assign | C1 | a1 | Test assignment one | - And I am on the "Course 1" "Course" page logged in as "teacher1" - And I change window size to "large" Scenario: I switch between the two report types within singleview - Given I navigate to "View > Single view" in the course gradebook + Given I am on the "Course 1" "grades > Single view > View" page logged in as "teacher1" And I click on "Grade items" "link" in the ".page-toggler" "css_element" And "Search users" "field" should not exist And I confirm "Test assignment one" in "grade" search within the gradebook widget exists diff --git a/grade/report/singleview/tests/behat/singleview.feature b/grade/report/singleview/tests/behat/singleview.feature index d0534cd0c0a..79e2738689b 100644 --- a/grade/report/singleview/tests/behat/singleview.feature +++ b/grade/report/singleview/tests/behat/singleview.feature @@ -55,9 +55,7 @@ Feature: We can use Single view And the following config values are set as admin: | fullnamedisplay | firstnamephonetic,lastnamephonetic | | alternativefullnameformat | middlename, alternatename, firstname, lastname | - And I log in as "teacher1" - And I am on "Course 1" course homepage - Given 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" Scenario: I can update grades, add feedback and exclude grades. Given I navigate to "View > Single view" in the course gradebook @@ -97,10 +95,7 @@ Feature: We can use Single view And the following should exist in the "generaltable" table: | First name (Alternate name) Last name | Grade | | Ann, Jill, Grainne, Beauchamp | Very good | - And I log out - And I log in as "teacher2" - And I am on "Course 1" course homepage - Given I navigate to "View > Single view" in the course gradebook + And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher2" And I click on "Users" "link" in the ".page-toggler" "css_element" And I click on "Student" in the "user" search widget And I turn editing mode on @@ -179,27 +174,19 @@ Feature: We can use Single view And I should see "Select a user above to view all their grades" in the "region-main" "region" And I click on "Grade items" "link" And I should see "Select a grade item above" in the "region-main" "region" - And I am on "Course 1" course homepage - When I navigate to "View > Single view" in the course gradebook + When I am on the "Course 1" "grades > Single view > View" page Then I should see "Select a grade item above" in the "region-main" "region" - And I log out - And I log in as "teacher3" - And I am on "Course 1" course homepage - And I navigate to "View > Single view" in the course gradebook + And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher3" And I should see "Select a user above to view all their grades" in the "region-main" "region" Scenario: Teacher sees his last viewed user report when navigating back to the gradebook singleview report. Given I navigate to "View > Single view" in the course gradebook And I click on "Gronya,Beecham" in the "user" search widget And I should see "Gronya,Beecham" in the "region-main" "region" - And I am on "Course 1" course homepage - When I navigate to "View > Single view" in the course gradebook + When I am on the "Course 1" "grades > Single view > View" page Then I should not see "Select a user above to view all their grades" in the "region-main" "region" And I should see "Gronya,Beecham" in the "region-main" "region" - And I log out - And I log in as "teacher3" - And I am on "Course 1" course homepage - And I navigate to "View > Single view" in the course gradebook + And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher3" And I should see "Select a user above to view all their grades" in the "region-main" "region" Scenario: Teacher sees his last viewed grade item report when navigating back to the gradebook singleview report. @@ -207,14 +194,10 @@ Feature: We can use Single view And I click on "Grade items" "link" And I click on "Test assignment one" in the "grade" search widget And I should see "Test assignment one" in the "region-main" "region" - And I am on "Course 1" course homepage - When I navigate to "View > Single view" in the course gradebook + When I am on the "Course 1" "grades > Single view > View" page Then I should not see "Select a grade item above" in the "region-main" "region" And I should see "Test assignment one" in the "region-main" "region" - And I log out - And I log in as "teacher3" - And I am on "Course 1" course homepage - And I navigate to "View > Single view" in the course gradebook + And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher3" And I should see "Select a user above to view all their grades" in the "region-main" "region" Scenario: Teacher sees his last viewed user report if the user is a part of the the current group. @@ -243,8 +226,7 @@ Feature: We can use Single view And the following "group members" exist: | user | group | | student2 | G1 | - And I am on "Course 1" course homepage - And I navigate to "Settings" in current page administration + And I am on the "Course 1" "course editing" page And I expand all fieldsets And I set the field "Group mode" to "Visible groups" And I press "Save and display" @@ -262,8 +244,7 @@ Feature: We can use Single view And I navigate to course participants And I click on "Unenrol" "icon" in the "Gronya,Beecham" "table_row" And I click on "Unenrol" "button" in the "Unenrol" "dialogue" - And I am on "Course 1" course homepage - When I navigate to "View > Single view" in the course gradebook + When I am on the "Course 1" "grades > Single view > View" page Then I should see "Select a user above to view all their grades" in the "region-main" "region" And I should not see "Gronya,Beecham" in the "region-main" "region" diff --git a/grade/report/singleview/tests/behat/usersearch.feature b/grade/report/singleview/tests/behat/usersearch.feature index ef4d7cf9c1c..8664d0d93e3 100644 --- a/grade/report/singleview/tests/behat/usersearch.feature +++ b/grade/report/singleview/tests/behat/usersearch.feature @@ -28,9 +28,8 @@ Feature: Within the singleview report, a teacher can search for users. | assign | C1 | a1 | Test assignment one | And the following config values are set as admin: | showuseridentity | idnumber,email,city,country,phone1,phone2,department,institution | - And I am on the "Course 1" "Course" page logged in as "teacher1" And I change window size to "large" - And I navigate to "View > Single view" in the course gradebook + And I am on the "Course 1" "grades > Single view > View" page logged in as "teacher1" And I click on "Users" "link" in the ".page-toggler" "css_element" Scenario: A teacher can view and trigger the user search @@ -122,8 +121,7 @@ Feature: Within the singleview report, a teacher can search for users. | Turtle Manatee | # Case: No users enrolled. - And I am on the "Course 2" "Course" page - And I navigate to "View > Single view" in the course gradebook + And I am on the "Course 2" "grades > Single view > View" page And I click on "Users" "link" in the ".page-toggler" "css_element" And I set the field "Search users" to "a" And I wait until "No results for \"a\"" "text" exists diff --git a/grade/report/user/tests/behat/groupsearch.feature b/grade/report/user/tests/behat/groupsearch.feature index 9f85bfd9668..6ff93841374 100644 --- a/grade/report/user/tests/behat/groupsearch.feature +++ b/grade/report/user/tests/behat/groupsearch.feature @@ -25,9 +25,7 @@ Feature: Group searching functionality within the user report. | student1 | dg | And the "multilang" filter is "on" And the "multilang" filter applies to "content and headings" - And I am on the "C1" "Course" page logged in as "teacher1" - And I change window size to "large" - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" Scenario: A teacher can see the 'group' search widget only when group mode is enabled in the course Given ".groupsearchwidget" "css_element" should exist diff --git a/grade/report/user/tests/behat/toggle_grade_categories.feature b/grade/report/user/tests/behat/toggle_grade_categories.feature index 9c24725e908..ddcd995c9e6 100644 --- a/grade/report/user/tests/behat/toggle_grade_categories.feature +++ b/grade/report/user/tests/behat/toggle_grade_categories.feature @@ -23,13 +23,11 @@ Feature: User can toggle the visibility of the grade categories within the user | activity | course | idnumber | name | intro | grade | | assign | C1 | a1 | Test assignment one | Submit something! | 300 | And the following "activities" exist: - | activity | course | idnumber | name | intro | gradecategory | grade | gradepass | - | assign | C1 | a2 | Test assignment two | Submit something! | Category 1 | 100 | 50 | - And I log in as "teacher1" - And I am on "Course" course homepage + | activity | course | idnumber | name | gradecategory | grade | gradepass | + | assign | C1 | a2 | Test assignment two | Category 1 | 100 | 50 | Scenario: A teacher can search for and find a user to view - Given I navigate to "View > User report" in the course gradebook + Given I am on the "Course" "grades > User report > View" page logged in as "teacher1" And I click on "Student 1" in the "user" search widget And I should see "Test assignment one" in the "user-grade" "table" And I should see "Test assignment two" in the "user-grade" "table" diff --git a/grade/report/user/tests/behat/user_report_navigation.feature b/grade/report/user/tests/behat/user_report_navigation.feature index 53afc34fae9..7de6c819b21 100644 --- a/grade/report/user/tests/behat/user_report_navigation.feature +++ b/grade/report/user/tests/behat/user_report_navigation.feature @@ -21,14 +21,12 @@ Feature: Teacher can navigate to the previous or next user report. | student2 | C1 | student | | student3 | C1 | student | And the following "activities" exist: - | activity | course | idnumber | name | intro | grade | - | assign | C1 | a1 | Test assignment one | Submit something! | 300 | - And I log in as "teacher1" - And I am on "Course" course homepage + | activity | course | idnumber | name | grade | + | assign | C1 | a1 | Test assignment one | 300 | + And I am on the "Course" "grades > User report > View" page logged in as "teacher1" Scenario: A teacher can navigate to the next user report - Given I navigate to "View > User report" in the course gradebook - And I click on "Student 1" in the "user" search widget + Given I click on "Student 1" in the "user" search widget And I should see "Student 1" in the ".user-heading" "css_element" And ".previous" "css_element" should not exist in the ".user-navigation" "css_element" And ".next" "css_element" should exist in the ".user-navigation" "css_element" @@ -46,8 +44,7 @@ Feature: Teacher can navigate to the previous or next user report. And ".next" "css_element" should not exist in the ".user-navigation" "css_element" Scenario: A teacher can navigate to the previous user report - Given I navigate to "View > User report" in the course gradebook - And I click on "Student 3" in the "user" search widget + Given I click on "Student 3" in the "user" search widget And I should see "Student 3" in the ".user-heading" "css_element" And ".previous" "css_element" should exist in the ".user-navigation" "css_element" And I should see "Student 2" in the ".previous" "css_element" diff --git a/grade/report/user/tests/behat/user_view.feature b/grade/report/user/tests/behat/user_view.feature index 26ebb8c60de..15bb04dd581 100644 --- a/grade/report/user/tests/behat/user_view.feature +++ b/grade/report/user/tests/behat/user_view.feature @@ -32,8 +32,7 @@ Feature: View the user report as the student will see it | assign | C1 | a6 | Test assignment six | Submit something! | 100 | And the "multilang" filter is "on" And the "multilang" filter applies to "content and headings" - When I am on the "C1" "Course" page logged in as "teacher1" - And I navigate to "Setup > Gradebook setup" in the course gradebook + When I am on the "C1" "grades > gradebook setup" page logged in as "teacher1" And I hide the grade item "Test assignment six" of type "gradeitem" on "setup" page And I hide the grade item "Sub category 2" of type "category" on "setup" page And I navigate to "View > Grader report" in the course gradebook diff --git a/grade/report/user/tests/behat/usersearch.feature b/grade/report/user/tests/behat/usersearch.feature index ee53ee4cf02..0f4782bdbad 100644 --- a/grade/report/user/tests/behat/usersearch.feature +++ b/grade/report/user/tests/behat/usersearch.feature @@ -28,9 +28,8 @@ Feature: Within the User report, a teacher can search for users. | assign | C1 | a1 | Test assignment one | And the following config values are set as admin: | showuseridentity | idnumber,email,city,country,phone1,phone2,department,institution | - And I am on the "Course 1" "Course" page logged in as "teacher1" And I change window size to "large" - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" Scenario: A teacher can view and trigger the user search # Check the placeholder text @@ -149,8 +148,7 @@ Feature: Within the User report, a teacher can search for users. | Dummy User | # Case: No users enrolled. - And I am on the "Course 2" "Course" page - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 2" "grades > User report > View" page And I set the field "Search users" to "a" And I should see "No results for \"a\"" diff --git a/grade/report/user/tests/behat/view_usereport.feature b/grade/report/user/tests/behat/view_usereport.feature index b954b57e352..76bb1097645 100644 --- a/grade/report/user/tests/behat/view_usereport.feature +++ b/grade/report/user/tests/behat/view_usereport.feature @@ -9,14 +9,12 @@ Feature: We can use the user report | Course 1 | C1 | 0 | 1 | Scenario: Verify we can view a user grade report with no users enrolled. - Given I log in as "admin" - And I am on "Course 1" course homepage - When I navigate to "View > User report" in the course gradebook + When I am on the "Course 1" "grades > User report > View" page logged in as "admin" Then I should see "There are no students enrolled in this course." Scenario: Teacher sees his last viewed user report when navigating back to the gradebook user report. Given the following "users" exist: - | username | firstname | lastname | email | + | username | firstname | lastname | email | | teacher1 | Teacher | 1 | teacher1@example.com | | teacher2 | Teacher | 2 | teacher2@example.com | | student1 | Student | 1 | student1@example.com | @@ -25,20 +23,14 @@ Feature: We can use the user report | teacher1 | C1 | editingteacher | | teacher2 | C1 | editingteacher | | student1 | C1 | student | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" And I should see "Select a user above to view their report" in the "region-main" "region" And I click on "Student 1" in the "user" search widget And I should see "Student 1" in the "region-main" "region" - And I am on "Course 1" course homepage - When I navigate to "View > User report" in the course gradebook + When I am on the "Course 1" "grades > User report > View" page Then I should not see "Select a user above to view their report" in the "region-main" "region" And I should see "Student 1" in the "region-main" "region" - And I log out - And I log in as "teacher2" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher2" And I should see "Select a user above to view their report" in the "region-main" "region" Scenario: Teacher sees his last viewed user report if the user is a part of the the current group. @@ -58,9 +50,7 @@ Feature: We can use the user report And the following "group members" exist: | user | group | | student2 | G1 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" And I click on "Student 2" in the "user" search widget And I navigate to "View > Grader report" in the course gradebook And I click on "Group 1" in the "group" search widget @@ -85,9 +75,7 @@ Feature: We can use the user report And the following "group members" exist: | user | group | | student2 | G1 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" And I click on "Student 1" in the "user" search widget And I navigate to "View > Grader report" in the course gradebook And I click on "Group 1" in the "group" search widget @@ -106,9 +94,7 @@ Feature: We can use the user report | teacher1 | C1 | editingteacher | | student1 | C1 | student | | student2 | C1 | student | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" And I click on "Student 1" in the "user" search widget And I should see "Student 1" in the "region-main" "region" And I navigate to course participants diff --git a/grade/tests/behat/behat_grades.php b/grade/tests/behat/behat_grades.php index 9deeef2762b..9df2e8a8961 100644 --- a/grade/tests/behat/behat_grades.php +++ b/grade/tests/behat/behat_grades.php @@ -57,6 +57,8 @@ class behat_grades extends behat_base { * | [report] view | Course name | The view page for the specified course and report | * | gradebook setup | Course name | The gradebook setup page for the specified course | * | course grade settings | Course name | The grade settings page | + * | outcomes | Course name | The grade outcomes page | + * | scales | Course name | The grade scales page | * * @param string $type identifies which type of page this is - for example "Grader > View" * @param string $identifier identifies the particular page - for example "Course name" @@ -106,6 +108,16 @@ class behat_grades extends behat_base { "/grade/edit/settings/index.php", ['id' => $this->get_course_id($identifier)] ); + case 'outcomes': + return new moodle_url( + "/grade/edit/outcome/course.php", + ['id' => $this->get_course_id($identifier)] + ); + case 'scales': + return new moodle_url( + "/grade/edit/scale/index.php", + ['id' => $this->get_course_id($identifier)] + ); default: throw new \coding_exception( "Unknown page type '$type' for page identifier '$identifier'" diff --git a/grade/tests/behat/grade_UI_settings.feature b/grade/tests/behat/grade_UI_settings.feature index 9f2758d636e..2fc689532d8 100644 --- a/grade/tests/behat/grade_UI_settings.feature +++ b/grade/tests/behat/grade_UI_settings.feature @@ -17,9 +17,7 @@ Feature: Site settings can be used to hide parts of the gradebook UI And the following "activities" exist: | activity | course | idnumber | name | intro | | assign | C1 | assign1 | Assignment1 | Assignment 1 intro | - And I log in as "admin" - And I am on "Course 1" course homepage - 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 "admin" And I turn editing mode on @javascript @@ -31,8 +29,7 @@ Feature: Site settings can be used to hide parts of the gradebook UI Then I navigate to "Grades > General settings" in site administration And I set the field "Show minimum grade" to "0" And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 1" "grades > Grader report > View" page And I click on grade item menu "Assignment1" of type "gradeitem" on "grader" page And I choose "Edit grade item" in the open action menu And I should not see "Minimum grade" @@ -43,6 +40,5 @@ Feature: Site settings can be used to hide parts of the gradebook UI Then I navigate to "Grades > Grade category settings" in site administration And I set the field "Allow category grades to be manually overridden" to "0" And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 1" "grades > Grader report > View" page And "tr .course input[type='text']" "css_element" should not exist diff --git a/grade/tests/behat/grade_aggregation.feature b/grade/tests/behat/grade_aggregation.feature index 8b1d525a746..f0c1d7d7a41 100644 --- a/grade/tests/behat/grade_aggregation.feature +++ b/grade/tests/behat/grade_aggregation.feature @@ -39,19 +39,17 @@ Feature: We can use calculated grade totals And I log in as "admin" And I set the following administration settings values: | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural | - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage with editing mode on - And I navigate to "View > Grader report" in the course gradebook - And I change window size to "large" - And I give the grade "60.00" to the user "Student 1" for the grade item "Test assignment one &" - And I give the grade "20.00" to the user "Student 1" for the grade item "Test assignment two" - And I give the grade "40.00" to the user "Student 1" for the grade item "Test assignment three" - And I give the grade "10.00" to the user "Student 1" for the grade item "Test assignment five" - And I give the grade "5.00" to the user "Student 1" for the grade item "Test assignment six" - And I give the grade "10.00" to the user "Student 1" for the grade item "Test assignment eight" - And I give the grade "5.00" to the user "Student 1" for the grade item "Test assignment nine" - And I press "Save changes" + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment one & | student1 | 60.00 | + | Test assignment two | student1 | 20.00 | + | Test assignment three | student1 | 40.00 | + | Test assignment five | student1 | 10.00 | + | Test assignment six | student1 | 5.00 | + | Test assignment eight | student1 | 10.00 | + | Test assignment nine | student1 | 5.00 | + And I am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" + And I turn editing mode on And I change window size to "large" And I hide the grade item "Test assignment two" of type "gradeitem" on "grader" page And I hide the grade item "Test assignment five" of type "gradeitem" on "grader" page @@ -261,10 +259,7 @@ Feature: We can use calculated grade totals Then I should see "114.82 (18.27 %)" in the "overview-grade" "table" And I click on "Course 1" "link" in the "region-main" "region" And "Test outcome item one" row "Grade" column of "user-grade" table should contain "Excellent (100.00 %)" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 set the following settings for grade item "Test outcome item one" of type "gradeitem" on "setup" page: | aggregationcoef | 1 | And I log out @@ -273,10 +268,7 @@ Feature: We can use calculated grade totals Then I should see "114.00 (18.39 %)" in the "overview-grade" "table" And I click on "Course 1" "link" in the "region-main" "region" And "Test outcome item one" row "Grade" column of "user-grade" table should contain "Excellent (100.00 %)" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 set the following settings for grade item "Course 1" of type "course" on "setup" page: | Aggregation | Natural | | Include outcomes in aggregation | 0 | @@ -378,10 +370,7 @@ Feature: We can use calculated grade totals | Test assignment four | 30.93 % | - | 0–150 | 0.00 % | Scenario: Natural aggregation with drop lowest - When I log out - And I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page logged in as "admin" And I turn editing mode on And I set the following settings for grade item "Course 1" of type "course" on "grader" page: | Aggregation | Natural | diff --git a/grade/tests/behat/grade_aggregation_changes.feature b/grade/tests/behat/grade_aggregation_changes.feature index 4ddbe4459c6..9cb64dab9e8 100644 --- a/grade/tests/behat/grade_aggregation_changes.feature +++ b/grade/tests/behat/grade_aggregation_changes.feature @@ -34,8 +34,7 @@ Feature: Changing the aggregation of an item affects its weight and extra credit And I change window size to "large" And I set the following administration settings values: | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural | - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 1" "grades > Grader report > View" page And I turn editing mode on And I click on grade item menu "Cat mean" of type "category" on "grader" page And I choose "Edit category" in the open action menu diff --git a/grade/tests/behat/grade_calculated_grade_items.feature b/grade/tests/behat/grade_calculated_grade_items.feature index 4bd08806dfd..e0cb543278f 100644 --- a/grade/tests/behat/grade_calculated_grade_items.feature +++ b/grade/tests/behat/grade_calculated_grade_items.feature @@ -18,9 +18,7 @@ Feature: Calculated grade items can be used in the gradebook | teacher1 | C1 | editingteacher | | student1 | C1 | student | | student2 | C1 | student | - And I log in as "admin" - And I am on "Course 1" course homepage - 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 "admin" @javascript Scenario: The max grade for a category item, with a calculation using Natural aggregation, can be changed diff --git a/grade/tests/behat/grade_calculated_grade_items_20150627.feature b/grade/tests/behat/grade_calculated_grade_items_20150627.feature index 22ce18b4d8f..070b19bd8aa 100644 --- a/grade/tests/behat/grade_calculated_grade_items_20150627.feature +++ b/grade/tests/behat/grade_calculated_grade_items_20150627.feature @@ -19,9 +19,7 @@ Feature: Gradebook calculations for calculated grade items before the fix 201506 | teacher1 | C1 | editingteacher | | student1 | C1 | student | | student2 | C1 | student | - And I log in as "admin" - And I am on "Course 1" course homepage - 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 "admin" @javascript Scenario: The max grade for a category item, with a calculation using Natural aggregation, can be changed diff --git a/grade/tests/behat/grade_calculated_weights.feature b/grade/tests/behat/grade_calculated_weights.feature index 145c399d4c9..1d3c7043929 100644 --- a/grade/tests/behat/grade_calculated_weights.feature +++ b/grade/tests/behat/grade_calculated_weights.feature @@ -27,19 +27,15 @@ Feature: We can understand the gradebook user report And I log in as "admin" And I set the following administration settings values: | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural | - And I log out - And 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 "60.00" to the user "Student 1" for the grade item "Test assignment one" - And I give the grade "20.00" to the user "Student 1" for the grade item "Test assignment two" - And I give the grade "40.00" to the user "Student 1" for the grade item "Test assignment three" - And I give the grade "10.00" to the user "Student 1" for the grade item "Test assignment four" - And I give the grade "70.00" to the user "Student 1" for the grade item "Test assignment five" - And I give the grade "30.00" to the user "Student 1" for the grade item "Test assignment six" - And I press "Save changes" - And I navigate to "Setup > Course grade settings" in the course gradebook + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment one | student1 | 60.00 | + | Test assignment two | student1 | 20.00 | + | Test assignment three | student1 | 40.00 | + | Test assignment four | student1 | 10.00 | + | Test assignment five | student1 | 70.00 | + | Test assignment six | student1 | 30.00 | + And I am on the "Course 1" "grades > course grade settings" page logged in as "teacher1" And I set the field "Show weightings" to "Show" And I set the field "Show contribution to course total" to "Show" And I press "Save changes" diff --git a/grade/tests/behat/grade_category_validation.feature b/grade/tests/behat/grade_category_validation.feature index 752ac4755de..fbbcd133b1e 100644 --- a/grade/tests/behat/grade_category_validation.feature +++ b/grade/tests/behat/grade_category_validation.feature @@ -16,40 +16,18 @@ Feature: Editing a grade item | user | course | role | | teacher1 | C1 | editingteacher | | student1 | C1 | student | - And I log in as "admin" - And I navigate to "Grades > Scales" in site administration - And I press "Add a new scale" - And I set the following fields to these values: - | Name | ABCDEF | - | Scale | F,E,D,C,B,A | - And I press "Save changes" - And I press "Add a new scale" - And I set the following fields to these values: - | Name | Letter scale | - | Scale | Disappointing, Good, Very good, Excellent | - And I press "Save changes" - And I set the following administration settings values: - | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural | - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook - And I press "Add category" - And I set the following fields to these values: - | Category name | Cat 1 | - | Aggregation | Highest grade | - And I click on "Save" "button" in the "New category" "dialogue" - And I wait until the page is ready - And I press "Add grade item" - And I set the following fields to these values: - | Item name | Item 1 | - | Grade category | Cat 1 | - And I click on "Save" "button" in the "New grade item" "dialogue" - And I press "Add grade item" - And I set the following fields to these values: - | Item name | Item 2 | - | Grade category | Cat 1 | - And I click on "Save" "button" in the "New grade item" "dialogue" + And the following "scales" exist: + | name | scale | + | ABCDEF | F,E,D,C,B,A | + | Letter scale | Disappointing, Good, Very good, Excellent | + And the following "grade categories" exist: + | fullname | course | aggregation | + | Cat 1 | C1 | 6 | + And the following "grade items" exist: + | itemname | course | category | + | Item 1 | C1 | Cat 1 | + | Item 2 | C1 | Cat 1 | + And I am on the "Course 1" "grades > gradebook setup" page logged in as "admin" Scenario: Being able to change the grade type, scale and maximum grade for a grade category when there are no overridden grades Given I click on grade item menu "Cat 1" of type "category" on "setup" page diff --git a/grade/tests/behat/grade_contribution_with_extra_credit.feature b/grade/tests/behat/grade_contribution_with_extra_credit.feature index 60edbc5dc29..5a823c442df 100644 --- a/grade/tests/behat/grade_contribution_with_extra_credit.feature +++ b/grade/tests/behat/grade_contribution_with_extra_credit.feature @@ -19,8 +19,7 @@ Feature: Extra credit contributions are normalised when going out of bounds And I log in as "admin" And I set the following administration settings values: | grade_aggregations_visible | Simple weighted mean of grades,Mean of grades (with extra credits),Natural | - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + And I am on the "Course 1" "grades > gradebook setup" page And I press "Add grade item" And I set the following fields to these values: | Item name | Manual item 1 | @@ -42,10 +41,7 @@ Feature: Extra credit contributions are normalised when going out of bounds And I set the field "Show weighting" to "Show" And I set the field "Show contribution to course total" to "Show" And I press "Save changes" - And I log out - And 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 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 "80.00" to the user "Student 1" for the grade item "Manual item 1" And I give the grade "10.00" to the user "Student 1" for the grade item "Manual item 2" diff --git a/grade/tests/behat/grade_feedback.feature b/grade/tests/behat/grade_feedback.feature index df52e26989b..1822880e128 100644 --- a/grade/tests/behat/grade_feedback.feature +++ b/grade/tests/behat/grade_feedback.feature @@ -19,9 +19,9 @@ Feature: Display feedback on the Grader report | student1 | C1 | student | | student2 | C1 | student | And the following "activities" exist: - | activity | course | section | name | intro | assignfeedback_comments_enabled | - | assign | C1 | 1 | Test assignment name 1 | Submit your online text | 1 | - | assign | C1 | 1 | Test assignment name 2 | submit your online text | 1 | + | activity | course | name | assignfeedback_comments_enabled | + | assign | C1 | Test assignment name 1 | 1 | + | assign | C1 | Test assignment name 2 | 1 | And the following "mod_assign > submissions" exist: | assign | user | onlinetext | | Test assignment name 1 | student1 | This is a submission for assignment 1 | @@ -32,8 +32,7 @@ Feature: Display feedback on the Grader report And the following "grade grades" exist: | gradeitem | user | grade | feedback | | Grade item 1 | student1 | | Longer feedback text content | - And I log in as "teacher1" - And I am on the "Test assignment name 1" "assign activity" page + And I am on the "Test assignment name 1" "assign activity" page logged in as teacher1 And I follow "View all submissions" And I click on "Grade" "link" in the "Student 1" "table_row" And I set the following fields to these values: @@ -42,28 +41,24 @@ Feature: Display feedback on the Grader report And I press "Save changes" Scenario: View the feedback icon on the Grader report - Given I am on "Course 1" course homepage - When I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page Then I should see "Test assignment name 1" in the "user-grades" "table" And I should see "Test assignment name 2" in the "user-grades" "table" And "Feedback provided" "icon" should exist in the "Student 1" "table_row" And "Feedback provided" "icon" should not exist in the "Student 2" "table_row" Scenario: View the feedback modal from the action menu - Given I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page And I click on "Test assignment name 1" "core_grades > grade_actions" in the "Student 1" "table_row" When I choose "View feedback" in the open action menu Then I should see "This is feedback" in the "Test assignment name 1" "dialogue" Scenario: View the feedback text for text only grade - Given I am on "Course 1" course homepage - When I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page Then I should see "Grade item 1" And "Longer feedback ..." "text" should exist in the "Student 1" "table_row" Scenario: View the feedback modal for text only grade - Given 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 When I click on "Longer feedback ..." "text" in the "Student 1" "table_row" Then I should see "Longer feedback text content" in the "Grade item 1" "dialogue" diff --git a/grade/tests/behat/grade_grade_minmax_change.feature b/grade/tests/behat/grade_grade_minmax_change.feature index 2279b2ecad0..e53961a9e05 100644 --- a/grade/tests/behat/grade_grade_minmax_change.feature +++ b/grade/tests/behat/grade_grade_minmax_change.feature @@ -19,9 +19,7 @@ Feature: We can change the maximum and minimum number of points for manual items | teacher1 | C1 | editingteacher | | student1 | C1 | student | | student2 | C1 | student | - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 press "Add grade item" And I set the following fields to these values: | Item name | Manual item 1 | @@ -34,8 +32,7 @@ Feature: We can change the maximum and minimum number of points for manual items And I press "Save changes" Scenario: Change maximum number of points on a graded item. - 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 "10.00" to the user "Student 1" for the grade item "Manual item 1" And I give the grade "8.00" to the user "Student 2" for the grade item "Manual item 1" diff --git a/grade/tests/behat/grade_hidden_items.feature b/grade/tests/behat/grade_hidden_items.feature index dd5146b260a..97e22099cfb 100644 --- a/grade/tests/behat/grade_hidden_items.feature +++ b/grade/tests/behat/grade_hidden_items.feature @@ -26,9 +26,7 @@ Feature: Student and teacher's view of aggregated grade items is consistent when | assign | C1 | a2 | Test assignment two | Submit something! | Sub category 1 | 100 | | assign | C1 | a3 | Test assignment three | Submit something! | Sub category 2 | 100 | | assign | C1 | a4 | Test assignment four | Submit something! | Sub category 2 | 100 | - And I log in as "admin" - And I am on "Course 1" course homepage - 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 "admin" And I press "Add grade item" And I set the following fields to these values: | Item name | calculated | @@ -40,18 +38,14 @@ Feature: Student and teacher's view of aggregated grade items is consistent when And I navigate to "Grades > Report settings > User report" in site administration And I set the field "s__grade_report_user_showtotalsifcontainhidden" to "Show totals excluding hidden items" And I press "Save changes" - When I log out - And 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 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 "50.00" to the user "Student 1" for the grade item "Test assignment one" And I give the grade "50.00" to the user "Student 1" for the grade item "Test assignment three" And I press "Save changes" And I set the following settings for grade item "Test assignment four" of type "gradeitem" on "grader" page: | Hidden | 1 | - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page And I click on "Student 1" in the "user" search widget And I set the field "View report as" to "Myself" Then the following should exist in the "user-grade" table: @@ -60,10 +54,7 @@ Feature: Student and teacher's view of aggregated grade items is consistent when | Test assignment two | 0.00 %( Empty ) | - | 0–100 | - | 0.00 % | | Test assignment three | 100.00 % | 50.00 | 0–100 | 50.00 % | 25.00 % | | Course total | - | 100.00 | 0–200 | 50.00 % | - | - When I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + When I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then the following should exist in the "user-grade" table: | Grade item | Calculated weight | Grade | Range | Percentage | Contribution to course total | | Test assignment one | 100.00 % | 50.00 | 0–100 | 50.00 % | 25.00 % | diff --git a/grade/tests/behat/grade_hidden_items_locked_category.feature b/grade/tests/behat/grade_hidden_items_locked_category.feature index 7554a882401..200c670f9e8 100644 --- a/grade/tests/behat/grade_hidden_items_locked_category.feature +++ b/grade/tests/behat/grade_hidden_items_locked_category.feature @@ -17,9 +17,7 @@ Feature: Hidden grade items should be hidden when grade category is locked, but | user | course | role | | teacher1 | C1 | editingteacher | | student1 | C1 | student | - And I log in as "admin" - And I am on "Course 1" course homepage - 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 "admin" And I press "Add category" And I set the following fields to these values: | Category name | Test locked category | @@ -31,22 +29,16 @@ Feature: Hidden grade items should be hidden when grade category is locked, but | Hidden | 1 | | Grade category | Test locked category | And I click on "Save" "button" in the "New grade item" "dialogue" - And I log out - And 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 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 "50.00" to the user "Student 1" for the grade item "Hidden item" And I press "Save changes" And I navigate to "Setup > Gradebook setup" in the course gradebook And I set the following settings for grade item "Test locked category" of type "category" on "setup" page: | Locked | 1 | - And I log out Scenario: Hidden grade items in locked category is hidden for teacher - Given I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + Given I am on the "Course 1" "grades > User report > View" page logged in as teacher1 And I click on "Student 1" in the "user" search widget When I set the field "View report as" to "Myself" Then the following should exist in the "user-grade" table: @@ -55,9 +47,7 @@ Feature: Hidden grade items should be hidden when grade category is locked, but | Course total | - | 50.00 | 0–100 | 50.00 % | - | Scenario: Hidden grade items in locked category is hidden for student - Given I log in as "student1" - And I am on "Course 1" course homepage - When I navigate to "User report" in the course gradebook + When I am on the "Course 1" "grades > User report > View" page logged in as student1 Then the following should exist in the "user-grade" table: | Grade item | Calculated weight | Grade | Range | Percentage | Contribution to course total | | Test locked category total | 100.00 % | - | 0–100 | - | - | @@ -65,9 +55,7 @@ Feature: Hidden grade items should be hidden when grade category is locked, but And I should not see "Hidden item" Scenario: Hidden grade items in overridden category should show - Given I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + Given I am on the "Course 1" "grades > gradebook setup" page And I press "Add category" And I set the following fields to these values: | Category name | Test overridden category B| @@ -82,10 +70,7 @@ Feature: Hidden grade items should be hidden when grade category is locked, but And I turn editing mode on And I give the grade "50.00" to the user "Student 1" for the grade item "Test overridden category B total" And I press "Save changes" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then the following should exist in the "user-grade" table: | Grade item | Calculated weight | Grade | Range | Percentage | Contribution to course total | | Test locked category total | 50.00 % | - | 0–100 | - | - | diff --git a/grade/tests/behat/grade_item_duplication.feature b/grade/tests/behat/grade_item_duplication.feature index 0b7695fdc9d..5ccb8e23436 100644 --- a/grade/tests/behat/grade_item_duplication.feature +++ b/grade/tests/behat/grade_item_duplication.feature @@ -25,9 +25,7 @@ Feature: We can duplicate grade items that already exist. | Item1 | C1 | Category1 | 001 | Value | 80.00 | 5.00 | 40.00 | 1 | 1 | 0 | 1 | Scenario: Ensure the duplicated grade item settings match the original grade item - Given I log in as "teacher1" - And I am on "Course 1" course homepage - 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 should not see "Duplicate Category1" And I should not see "Duplicate Assignment1" When I duplicate the grade item "Item1" diff --git a/grade/tests/behat/grade_item_form_unhide.feature b/grade/tests/behat/grade_item_form_unhide.feature index 9e0765fe22a..3185d7e9844 100644 --- a/grade/tests/behat/grade_item_form_unhide.feature +++ b/grade/tests/behat/grade_item_form_unhide.feature @@ -26,33 +26,23 @@ Feature: Teacher can unhide grades on the edit page allowing students to view th | Grade out of 100 | 50 | | Feedback comments | I'm the teacher feedback | And I press "Save changes" - And I am on "Course 1" course homepage - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should see "50.00" And I should see "I'm the teacher feedback" in the "Feedback comments" "table_row" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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" @javascript Scenario: Hiding the activity using the drop-down hide link and then unhiding the activity using the edit settings form page Given I hide the grade item "Test assignment name" of type "gradeitem" on "setup" page - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should not see "50.00" And I should not see "I'm the teacher feedback" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 click on grade item menu "Test assignment name" of type "gradeitem" on "setup" page And I choose "Edit grade item" in the open action menu And the field "Hidden" matches value "1" And I set the field "Hidden" to "0" And I click on "Save" "button" in the "Edit grade item" "dialogue" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 Then I should see "50.00" And I should see "I'm the teacher feedback" in the "Feedback comments" "table_row" @@ -63,17 +53,12 @@ Feature: Teacher can unhide grades on the edit page allowing students to view th And I choose "Edit grade item" in the open action menu And I set the field "Hidden" to "1" And I click on "Save" "button" in the "Edit grade item" "dialogue" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should not see "50.00" And I should not see "I'm the teacher feedback" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 click on grade item menu "Test assignment name" of type "gradeitem" on "setup" page And I choose "Show" in the open action menu - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 Then I should see "50.00" And I should see "I'm the teacher feedback" in the "Feedback comments" "table_row" @@ -81,20 +66,15 @@ Feature: Teacher can unhide grades on the edit page allowing students to view th @javascript Scenario: Hiding the category using the drop-down hide link and then unhiding the category using the edit settings form page Given I hide the grade item "Course 1" of type "course" on "setup" page - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should not see "50.00" And I should not see "I'm the teacher feedback" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 click on grade item menu "Course 1" of type "course" on "setup" page And I choose "Edit category" in the open action menu And the field "Hidden" matches value "1" And I set the field "Hidden" to "0" And I click on "Save" "button" in the "Edit category" "dialogue" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 Then I should see "50.00" And I should see "I'm the teacher feedback" in the "Feedback comments" "table_row" @@ -103,17 +83,12 @@ Feature: Teacher can unhide grades on the edit page allowing students to view th Scenario: Hiding the category using the edit settings form page and then unhiding the category using the drop-down show link Given I set the following settings for grade item "Course 1" of type "course" on "setup" page: | Hidden | 1 | - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should not see "50.00" And I should not see "I'm the teacher feedback" - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 click on grade item menu "Course 1" of type "course" on "setup" page And I choose "Show" in the open action menu - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 Then I should see "50.00" And I should see "I'm the teacher feedback" in the "Feedback comments" "table_row" diff --git a/grade/tests/behat/grade_item_validation.feature b/grade/tests/behat/grade_item_validation.feature index 522e235ece7..02a3118adf2 100644 --- a/grade/tests/behat/grade_item_validation.feature +++ b/grade/tests/behat/grade_item_validation.feature @@ -31,8 +31,7 @@ Feature: Grade item validation | Name | Letter scale | | Scale | Disappointing, Good, Very good, Excellent | And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + And I am on the "Course 1" "grades > gradebook setup" page And I press "Add grade item" And I set the following fields to these values: | Item name | MI 1 | @@ -62,7 +61,7 @@ Feature: Grade item validation And I press "Save changes" And I navigate to "Setup > Gradebook setup" in the course gradebook And I click on grade item menu "MI 1" of type "gradeitem" on "setup" page - And I choose "Edit grade item" in the open action menu + When I choose "Edit grade item" in the open action menu Then I should see "Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades." And "//div[contains(concat(' ', normalize-space(@class), ' '), 'felement') and contains(text(), 'Value')]" "xpath_element" should exist @@ -89,7 +88,7 @@ Feature: Grade item validation And I press "Save changes" And I navigate to "Setup > Gradebook setup" in the course gradebook And I click on grade item menu "MI 1" of type "gradeitem" on "setup" page - And I choose "Edit grade item" in the open action menu + When I choose "Edit grade item" in the open action menu Then I should see "Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades." And I should see "Choose" in the "Rescale existing grades" "field" And the "Maximum grade" "field" should be disabled diff --git a/grade/tests/behat/grade_letter_boundary.feature b/grade/tests/behat/grade_letter_boundary.feature index bd79c2c67ea..2cf19722930 100644 --- a/grade/tests/behat/grade_letter_boundary.feature +++ b/grade/tests/behat/grade_letter_boundary.feature @@ -20,9 +20,7 @@ Feature: We can customise the letter boundary of a course. And the following "activities" exist: | activity | course | idnumber | name | intro | grade | | assign | C1 | a1 | Test assignment one | Submit something! | 100 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Setup > Course grade settings" in the course gradebook + And I am on the "Course 1" "grades > course grade settings" page logged in as "teacher1" And I set the following fields to these values: | Grade display type | Letter | And I press "Save changes" diff --git a/grade/tests/behat/grade_letter_boundary_20160518.feature b/grade/tests/behat/grade_letter_boundary_20160518.feature index 782b34d4288..9c6636e9837 100644 --- a/grade/tests/behat/grade_letter_boundary_20160518.feature +++ b/grade/tests/behat/grade_letter_boundary_20160518.feature @@ -21,9 +21,7 @@ Feature: We can customise the letter boundary of a course in gradebook version 2 And the following "activities" exist: | activity | course | idnumber | name | intro | grade | | assign | C1 | a1 | Test assignment one | Submit something! | 100 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "Setup > Course grade settings" in the course gradebook + And I am on the "Course 1" "grades > course grade settings" page logged in as "teacher1" And I set the following fields to these values: | Grade display type | Letter | And I press "Save changes" diff --git a/grade/tests/behat/grade_letter_logging.feature b/grade/tests/behat/grade_letter_logging.feature index 7d7426227ca..2e1d431fd48 100644 --- a/grade/tests/behat/grade_letter_logging.feature +++ b/grade/tests/behat/grade_letter_logging.feature @@ -8,9 +8,7 @@ Feature: We can view the logs for any changes to grade letters. Given the following "courses" exist: | fullname | shortname | category | | Course 1 | C1 | 0 | - And I log in as "admin" - And I am on "Course 1" course homepage - And I navigate to "Setup > Course grade settings" in the course gradebook + And I am on the "Course 1" "grades > course grade settings" page logged in as "admin" And I set the following fields to these values: | Grade display type | Letter | And I press "Save changes" diff --git a/grade/tests/behat/grade_mingrade.feature b/grade/tests/behat/grade_mingrade.feature index 7835184b87b..48885fe9e35 100644 --- a/grade/tests/behat/grade_mingrade.feature +++ b/grade/tests/behat/grade_mingrade.feature @@ -25,8 +25,7 @@ Feature: We can use a minimum grade different than zero And I log in as "admin" And I set the following administration settings values: | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural | - And I am on "Course 1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + And I am on the "Course 1" "grades > gradebook setup" page And I press "Add grade item" And I set the following fields to these values: | Item name | Manual item 1 | @@ -81,10 +80,7 @@ Feature: We can use a minimum grade different than zero And I set the following settings for grade item "Course 1" of type "course" on "setup" page: | Aggregation | Natural | | Exclude empty grades | 0 | - And I log out - And 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 am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" And I turn editing mode on When I give the grade "-25.00" to the user "Student 1" for the grade item "Manual item 1" And I give the grade "50.00" to the user "Student 1" for the grade item "Manual item 2" diff --git a/grade/tests/behat/grade_minmax.feature b/grade/tests/behat/grade_minmax.feature index ab39d038cce..86d8ad2af62 100644 --- a/grade/tests/behat/grade_minmax.feature +++ b/grade/tests/behat/grade_minmax.feature @@ -24,8 +24,7 @@ Feature: We can choose what min or max grade to use when aggregating grades. And I log in as "admin" And I set the following administration settings values: | grade_minmaxtouse | Min and max grades as specified in grade item settings | - And I am on "C1" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + And I am on the "C1" "grades > gradebook setup" page And I press "Add grade item" And I set the following fields to these values: | Item name | MI 1 | @@ -63,10 +62,7 @@ Feature: We can choose what min or max grade to use when aggregating grades. And I navigate to "Setup > Gradebook setup" in the course gradebook And I set the following settings for grade item "CAT1" of type "category" on "setup" page: | Aggregation | Natural | - And I log out - And I log in as "teacher1" - And I am on "C1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "C1" "grades > Grader report > View" page logged in as "teacher1" And I turn editing mode on And I give the grade "75.00" to the user "Student 1" for the grade item "MI 1" And I give the grade "25.00" to the user "Student 1" for the grade item "MI 2" diff --git a/grade/tests/behat/grade_natural_exclude_empty.feature b/grade/tests/behat/grade_natural_exclude_empty.feature index 3a5cd708f79..ae9cca41a81 100644 --- a/grade/tests/behat/grade_natural_exclude_empty.feature +++ b/grade/tests/behat/grade_natural_exclude_empty.feature @@ -23,9 +23,7 @@ Feature: Weights in natural aggregation are adjusted if the items are excluded f | assign | C1 | a3 | Test assignment three | x | 200 | | assign | C1 | a4 | Test assignment four (extra) | x | 20 | | assign | C1 | a5 | Test assignment five (extra) | x | 10 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 set the following settings for grade item "Test assignment four (extra)" of type "gradeitem" on "setup" page: | Extra credit | 1 | And I set the following settings for grade item "Test assignment five (extra)" of type "gradeitem" on "setup" page: diff --git a/grade/tests/behat/grade_natural_exclude_empty_20150619.feature b/grade/tests/behat/grade_natural_exclude_empty_20150619.feature index 717577a67fd..9027455bb46 100644 --- a/grade/tests/behat/grade_natural_exclude_empty_20150619.feature +++ b/grade/tests/behat/grade_natural_exclude_empty_20150619.feature @@ -24,9 +24,7 @@ Feature: Gradebook calculations for extra credit items before the fix 20150619 | assign | C1 | a3 | Test assignment three | x | 200 | | assign | C1 | a4 | Test assignment four (extra) | x | 20 | | assign | C1 | a5 | Test assignment five (extra) | x | 10 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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 set the following settings for grade item "Test assignment four (extra)" of type "gradeitem" on "setup" page: | Extra credit | 1 | And I set the following settings for grade item "Test assignment five (extra)" of type "gradeitem" on "setup" page: diff --git a/grade/tests/behat/grade_natural_normalisation.feature b/grade/tests/behat/grade_natural_normalisation.feature index c2baf3e41a7..78965723b7e 100644 --- a/grade/tests/behat/grade_natural_normalisation.feature +++ b/grade/tests/behat/grade_natural_normalisation.feature @@ -30,9 +30,7 @@ Feature: We can use natural aggregation and weights will be normalised to a tota | assign | C1 | a5 | Test assignment five | Submit something! | Sub category 1 | 20 | | assign | C1 | a6 | Test assignment six | Submit something! | Sub category 1 | 10 | | assign | C1 | a7 | Test assignment seven | Submit nothing! | Sub category 1 | 15 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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" @javascript Scenario: Setting all weights in a category to exactly one hundred in total. diff --git a/grade/tests/behat/grade_natural_normalisation_20150619.feature b/grade/tests/behat/grade_natural_normalisation_20150619.feature index af61dfcd4ac..ccc07a71525 100644 --- a/grade/tests/behat/grade_natural_normalisation_20150619.feature +++ b/grade/tests/behat/grade_natural_normalisation_20150619.feature @@ -31,9 +31,7 @@ Feature: Gradebook calculations for natural weights normalisation before the fix | assign | C1 | a5 | Test assignment five | Submit something! | Sub category 1 | 20 | | assign | C1 | a6 | Test assignment six | Submit something! | Sub category 1 | 10 | | assign | C1 | a7 | Test assignment seven | Submit nothing! | Sub category 1 | 15 | - And I log in as "teacher1" - And I am on "Course 1" course homepage - 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" @javascript Scenario: Grade items weights are normalised when all grade item weights are overridden (sum exactly 100). Extra credit is set to zero (before the fix 20150619). diff --git a/grade/tests/behat/grade_regrade_do_not_override.feature b/grade/tests/behat/grade_regrade_do_not_override.feature index 6ce3b737671..3f52e80c1a6 100644 --- a/grade/tests/behat/grade_regrade_do_not_override.feature +++ b/grade/tests/behat/grade_regrade_do_not_override.feature @@ -30,8 +30,7 @@ Feature: Regrading grades does not unnecessarily mark some as overriden And I press "Save and show next" And I set the field "Grade out of 100" to "60" And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + And I am on the "Course 1" "grades > Grader report > View" page And the following should exist in the "gradereport-grader-table" table: | | | | | First name / Last name | Assignment 1 | Course total | @@ -40,7 +39,6 @@ Feature: Regrading grades does not unnecessarily mark some as overriden And I turn editing mode on And I give the grade "80.00" to the user "Student 2" for the grade item "Course total" And I press "Save changes" - And I navigate to "View > Grader report" in the course gradebook And I navigate to "Setup > Gradebook setup" in the course gradebook And I set the following settings for grade item "Course 1" of type "course" on "setup" page: | Aggregation | Weighted mean of grades | @@ -63,8 +61,7 @@ Feature: Regrading grades does not unnecessarily mark some as overriden And I press "Save and show next" And I set the field "Grade out of 100" to "70" And I press "Save changes" - When I am on "Course 1" course homepage - And I navigate to "View > Grader report" in the course gradebook + When I am on the "Course 1" "grades > Grader report > View" page Then the following should exist in the "gradereport-grader-table" table: | | | | | First name / Last name | Assignment 1 | Course total | diff --git a/grade/tests/behat/grade_scales_aggregation.feature b/grade/tests/behat/grade_scales_aggregation.feature index de82a4cf564..3ce40aa582e 100644 --- a/grade/tests/behat/grade_scales_aggregation.feature +++ b/grade/tests/behat/grade_scales_aggregation.feature @@ -34,12 +34,9 @@ Feature: Control the aggregation of the scales | Scale me | C1 | Letterscale | And the following config values are set as admin: | grade_includescalesinaggregation | 0 | - And I log out Scenario Outline: Scales can be excluded from aggregation - 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 logged in as "teacher1" And I turn editing mode on When I give the grade "10" to the user "Student 1" for the grade item "Grade me" And I give the grade "B" to the user "Student 1" for the grade item "Scale me" @@ -57,10 +54,7 @@ Feature: Control the aggregation of the scales And I log in as "admin" And I set the following administration settings values: | grade_includescalesinaggregation | 1 | - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" And I click on "Student 1" in the "user" search widget And the following should exist in the "user-grade" table: | Grade item | Grade | Percentage | Contribution to course total | @@ -81,9 +75,7 @@ Feature: Control the aggregation of the scales | Mode of grades | 10.00 | 10.00 % | 10.00 | 0.00 | 75.00 | 75.00 % | 0.00 % | 75.00 % | Scenario: Weights of scales cannot be edited when they are not aggregated - 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 logged in as "teacher1" And I turn editing mode on When I set the following settings for grade item "Course 1" of type "course" on "grader" page: | Aggregation | Natural | diff --git a/grade/tests/behat/grade_single_item_scales.feature b/grade/tests/behat/grade_single_item_scales.feature index 57549b59a07..18889649ce4 100644 --- a/grade/tests/behat/grade_single_item_scales.feature +++ b/grade/tests/behat/grade_single_item_scales.feature @@ -48,8 +48,7 @@ Feature: View gradebook when single item scales are used And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade" to "A" And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "Setup > Course grade settings" in the course gradebook + When I am on the "Course 1" "grades > course grade settings" page And I set the field "Show weightings" to "Show" And I set the field "Show contribution to course total" to "Show" And I press "Save changes" diff --git a/grade/tests/behat/grade_view.feature b/grade/tests/behat/grade_view.feature index a9b6a83c786..278ce753c07 100644 --- a/grade/tests/behat/grade_view.feature +++ b/grade/tests/behat/grade_view.feature @@ -18,31 +18,13 @@ Feature: We can enter in grades and view reports from the gradebook | teacher1 | C1 | editingteacher | | student1 | C1 | student | And the following "activities" exist: - | activity | name | intro | course | section | idnumber | - | assign | Test assignment name 1 | Submit your online text | C1 | 1 | assign1 | - | assign | Test assignment name 2 | Submit your online text | C1 | 1 | assign2 | + | activity | name | course | idnumber | assignsubmission_onlinetext_enabled | + | assign | Test assignment name 1 | C1 | assign1 | 1 | + | assign | Test assignment name 2 | C1 | assign2 | 1 | And I log in as "admin" And I set the following administration settings values: | grade_aggregations_visible | Mean of grades,Weighted mean of grades,Simple weighted mean of grades,Mean of grades (with extra credits),Median of grades,Lowest grade,Highest grade,Mode of grades,Natural | - And I log out - And I log in as "teacher1" - And I am on "Course 1" course homepage - And I follow "Test assignment name 1" - And I navigate to "Settings" in current page administration - And I set the following fields to these values: - | Description | Submit your online text | - | assignsubmission_onlinetext_enabled | 1 | - And I press "Save and return to course" - And I follow "Test assignment name 2" - And I navigate to "Settings" in current page administration - And I set the following fields to these values: - | Description | Submit your online text | - | assignsubmission_onlinetext_enabled | 1 | - And I press "Save and return to course" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I follow "Test assignment name 1" + And I am on the "Test assignment name 1" "assign activity" page logged in as student1 When I press "Add submission" And I set the following fields to these values: | Online text | This is a submission for assignment 1 | @@ -50,8 +32,7 @@ Feature: We can enter in grades and view reports from the gradebook And I press "Submit assignment" And I press "Continue" Then I should see "Submitted for grading" - And I am on "Course 1" course homepage - And I follow "Test assignment name 2" + And I am on the "Test assignment name 2" "assign activity" page When I press "Add submission" And I set the following fields to these values: | Online text | This is a submission for assignment 2 | @@ -59,10 +40,7 @@ Feature: We can enter in grades and view reports from the gradebook And I press "Submit assignment" And I press "Continue" Then I should see "Submitted for grading" - And I log out - And 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 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 "80.00" to the user "Student 1" for the grade item "Test assignment name 1" And I give the grade "90.00" to the user "Student 1" for the grade item "Test assignment name 2" diff --git a/grade/tests/behat/toggle_grade_categories.feature b/grade/tests/behat/toggle_grade_categories.feature index 7965fb915d6..f410dc89cc2 100644 --- a/grade/tests/behat/toggle_grade_categories.feature +++ b/grade/tests/behat/toggle_grade_categories.feature @@ -28,12 +28,10 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade And the following "grade items" exist: | itemname | grademax | course | gradecategory | | Manual grade | 40 | C1 | Category 1 | - And I log in as "teacher1" - And I am on "Course" course homepage + And I am on the "Course" "grades > gradebook setup" page logged in as "teacher1" Scenario: A teacher can collapse and expand grade categories in the Gradebook setup page - Given I navigate to "Setup > Gradebook setup" in the course gradebook - And the following should exist in the "setup-grades" table: + Given the following should exist in the "setup-grades" table: | Name | | Course | | Test assignment one | @@ -105,8 +103,7 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade | Category 1 total | Scenario: A teacher can see the aggregated max grade for a grade category even when the category is collapsed - Given I navigate to "Setup > Gradebook setup" in the course gradebook - And the following should exist in the "setup-grades" table: + Given the following should exist in the "setup-grades" table: | Name | Max grade | | Course | | | Category 1 | | @@ -134,8 +131,7 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade And I should not see "Category 1 total" in the "setup-grades" "table" Scenario: A teacher can collapse and expand grade categories in the Gradebook setup when moving grade items - Given I navigate to "Setup > Gradebook setup" in the course gradebook - And I click on "Move" "link" in the "Test assignment one" "table_row" + Given I click on "Move" "link" in the "Test assignment one" "table_row" And the following should exist in the "setup-grades" table: | Name | | Course | @@ -205,12 +201,10 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade | Category 1 total | Scenario: Previously collapsed categories are still shown as collapsed when a teacher navigates back to Gradebook setup - Given I navigate to "Setup > Gradebook setup" in the course gradebook # Collapse the grade category 'Category 1' and navigate to the course homepage. - And I click on "Collapse" "link" in the "Category 1" "table_row" - And I am on "Course" course homepage + Given I click on "Collapse" "link" in the "Category 1" "table_row" # Navigate back to Gradebook setup and confirm that the category 'Category 1' is still collapsed. - When I navigate to "Setup > Gradebook setup" in the course gradebook + When I am on the "Course" "grades > gradebook setup" page Then the following should exist in the "setup-grades" table: | Name | | Course | @@ -226,9 +220,8 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade | Category 1 total | Scenario: Previously collapsed categories are still shown as collapsed when a teacher is moving grade items in Gradebook setup - Given I navigate to "Setup > Gradebook setup" in the course gradebook # Collapse the grade category 'Category 1'. - And I click on "Collapse" "link" in the "Category 1" "table_row" + Given I click on "Collapse" "link" in the "Category 1" "table_row" # Attempt to move a grade item and confirm that the category 'Category 1' is still collapsed. When I click on "Move" "link" in the "Test assignment one" "table_row" Then the following should exist in the "setup-grades" table: @@ -246,13 +239,10 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade | Category 1 total | Scenario: Grade categories are shown as collapsed only to the teacher that collapsed them - Given I navigate to "Setup > Gradebook setup" in the course gradebook # Collapse the grade category 'Category 1'. - And I click on "Collapse" "link" in the "Category 1" "table_row" + Given I click on "Collapse" "link" in the "Category 1" "table_row" # Log in as teacher2 and confirm that the category 'Category 1' is not collapsed. - And I log in as "teacher2" - And I am on "Course" course homepage - When I navigate to "Setup > Gradebook setup" in the course gradebook + When I am on the "Course" "grades > gradebook setup" page logged in as "teacher2" Then the following should exist in the "setup-grades" table: | Name | | Course | @@ -265,9 +255,7 @@ Feature: Teachers can toggle the visibility of the grade categories in the Grade And "Collapse" "link" should exist in the "Course" "table_row" And "Collapse" "link" should exist in the "Category 1" "table_row" # Log in as teacher1 and confirm that the category 'Category 1' is still collapsed. - And I log in as "teacher1" - And I am on "Course" course homepage - And I navigate to "Setup > Gradebook setup" in the course gradebook + And I am on the "Course" "grades > gradebook setup" page logged in as "teacher1" And the following should exist in the "setup-grades" table: | Name | | Course | diff --git a/lib/tests/behat/switch_editing_mode.feature b/lib/tests/behat/switch_editing_mode.feature index 65abcb5b87e..ff8ccabc6aa 100644 --- a/lib/tests/behat/switch_editing_mode.feature +++ b/lib/tests/behat/switch_editing_mode.feature @@ -23,9 +23,7 @@ Feature: Turn editing mode on Given the following "activities" exist: | activity | course | idnumber | name | intro | | assign | C1 | assign1 | Test Assignment 1 | Test Assignment 1 | - And 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 am on the "Course 1" "grades > Grader report > View" page logged in as "teacher1" And I turn editing mode on And I click on grade item menu "Test Assignment 1" of type "gradeitem" on "grader" page And "Edit grade item" "link" should exist diff --git a/mod/assign/tests/behat/bulk_release_anon_submissions.feature b/mod/assign/tests/behat/bulk_release_anon_submissions.feature index af8c9469385..51944e67fb9 100644 --- a/mod/assign/tests/behat/bulk_release_anon_submissions.feature +++ b/mod/assign/tests/behat/bulk_release_anon_submissions.feature @@ -24,7 +24,6 @@ Feature: Bulk released grades should not be sent to gradebook while submissions | activity | assign | | course | C1 | | name | Test assignment name | - | intro | Test assignment description | | assignsubmission_onlinetext_enabled | 1 | | assignsubmission_file_enabled | 0 | | markingworkflow | 1 | @@ -39,7 +38,6 @@ Feature: Bulk released grades should not be sent to gradebook while submissions And I set the following fields to these values: | Online text | I'm student1's submission | And I press "Save changes" - And I log out # Add another submission. And I am on the "Test assignment name" "assign activity" page logged in as "student2" Then I should not see "Feedback" @@ -48,7 +46,6 @@ Feature: Bulk released grades should not be sent to gradebook while submissions And I set the following fields to these values: | Online text | I'm student2's submission | And I press "Save changes" - And I log out # Mark the submissions. And I am on the "Test assignment name" "assign activity" page logged in as "teacher1" And I follow "View all submissions" @@ -87,35 +84,22 @@ Feature: Bulk released grades should not be sent to gradebook while submissions And I follow "View all submissions" Then I should see "Released" in the "I'm student1's submission" "table_row" And I should see "Released" in the "I'm student2's submission" "table_row" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then I should not see "50" And I should not see "Great job!" - And I log out - And I log in as "student2" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student2" Then I should not see "50" And I should not see "Great job!" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as "teacher1" And I follow "View all submissions" And I set the field "Grading action" to "Reveal student identities" And I press "Continue" Then I should see "Released" in the "Student 1" "table_row" And I should see "Released" in the "Student 2" "table_row" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then I should see "50" And I should see "Great job!" - And I log out - And I log in as "student2" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student2" Then I should see "50" And I should see "Great job!" @@ -135,15 +119,9 @@ Feature: Bulk released grades should not be sent to gradebook while submissions And I follow "View all submissions" Then I should see "Released" in the "Student 1" "table_row" And I should see "Released" in the "Student 2" "table_row" - And I log out - And I log in as "student1" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then I should see "50" And I should see "Great job!" - And I log out - And I log in as "student2" - And I am on "Course 1" course homepage - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student2" Then I should see "50" And I should see "Great job!" diff --git a/mod/assign/tests/behat/outcome_grading.feature b/mod/assign/tests/behat/outcome_grading.feature index 29ba2438496..7ad077fa17e 100644 --- a/mod/assign/tests/behat/outcome_grading.feature +++ b/mod/assign/tests/behat/outcome_grading.feature @@ -20,22 +20,13 @@ Feature: Outcome grading | student1 | C1 | student | And the following config values are set as admin: | enableoutcomes | 1 | - And I log in as "admin" - And I navigate to "Grades > Scales" in site administration - And I press "Add a new scale" - And I set the following fields to these values: - | Name | Test Scale | - | Scale | Disappointing, Excellent, Good, Very good, Excellent | - And I press "Save changes" - And I navigate to "Grades > Outcomes" in site administration - And I press "Add a new outcome" - And I set the following fields to these values: - | Full name | Outcome Test | - | Short name | OT | - | Scale | Test Scale | - And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "More > Outcomes" in the course gradebook + And the following "scales" exist: + | name | scale | + | Test Scale | Disappointing, Excellent, Good, Very good, Excellent | + And the following "grade outcomes" exist: + | fullname | shortname | scale | + | Outcome Test | OT | Test Scale | + And I am on the "Course 1" "grades > outcomes" page logged in as admin And I set the field "Available standard outcomes" to "Outcome Test" And I click on "#add" "css_element" And I log out @@ -49,13 +40,11 @@ Feature: Outcome grading | Description | Test assignment description | | assignsubmission_onlinetext_enabled | 1 | | Outcome Test | 1 | - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I press "Add submission" And I set the following fields to these values: | Online text | My online text | And I press "Save changes" - And I log out When I am on the "Test assignment name" "assign activity" page logged in as teacher1 And I follow "View all submissions" And I click on "Grade" "link" in the "Student 0" "table_row" @@ -92,13 +81,11 @@ Feature: Outcome grading | Students submit in groups | Yes | | Group mode | No groups | | Outcome Test | 1 | - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I press "Add submission" And I set the following fields to these values: | Online text | My online text | And I press "Save changes" - And I log out When I am on the "Test assignment name" "assign activity" page logged in as teacher1 And I follow "View all submissions" And I click on "Grade" "link" in the "Student 0" "table_row" diff --git a/mod/assign/tests/behat/quickgrading.feature b/mod/assign/tests/behat/quickgrading.feature index d11788ca5ce..bb6bd36a7be 100644 --- a/mod/assign/tests/behat/quickgrading.feature +++ b/mod/assign/tests/behat/quickgrading.feature @@ -52,9 +52,7 @@ Feature: In an assignment, teachers grade multiple students on one page | student2 | C1 | student | And the following config values are set as admin: | enableoutcomes | 1 | - When I log in as "teacher1" - And I am on "Course 1" course homepage - And I navigate to "More > Outcomes" in the course gradebook + When I am on the "Course 1" "grades > outcomes" page logged in as teacher1 And I press "Manage outcomes" And I press "Add a new outcome" And I follow "Add a new scale" @@ -62,8 +60,7 @@ Feature: In an assignment, teachers grade multiple students on one page | Name | 1337dom scale | | Scale | Noob, Nub, 1337, HaXor | And I press "Save changes" - And I am on "Course 1" course homepage - And I navigate to "More > Outcomes" in the course gradebook + And I am on the "Course 1" "grades > outcomes" page And I press "Manage outcomes" And I press "Add a new outcome" And I set the following fields to these values: @@ -78,19 +75,16 @@ Feature: In an assignment, teachers grade multiple students on one page | assignsubmission_onlinetext_enabled | 1 | | assignsubmission_file_enabled | 0 | | M8d skillZ! | 1 | - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I press "Add submission" And I set the following fields to these values: | Online text | I'm the student1 submission | And I press "Save changes" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student2 When I press "Add submission" And I set the following fields to these values: | Online text | I'm the student2 submission | And I press "Save changes" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as teacher1 And I follow "View all submissions" And I click on "Grade" "link" in the "Student 1" "table_row" @@ -105,21 +99,18 @@ Feature: In an assignment, teachers grade multiple students on one page And I press "Save all quick grading changes" And I should see "The grade changes were saved" And I press "Continue" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should see "I'm the teacher first feedback" And I should see "60.0" And I follow "Grades" in the user menu And I click on "Course 1" "link" in the "region-main" "region" And I should see "1337" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student2 And I should not see "I'm the teacher first feedback" And I should not see "60.0" And I follow "Grades" in the user menu And I click on "Course 1" "link" in the "region-main" "region" And I should not see "1337" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as teacher1 And I follow "View all submissions" And I click on "Hide User picture" "link" @@ -138,14 +129,12 @@ Feature: In an assignment, teachers grade multiple students on one page And I press "Save all quick grading changes" And I should see "The grade changes were saved" And I press "Continue" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student1 And I should see "I'm the teacher first feedback" And I should see "60.0" And I follow "Grades" in the user menu And I click on "Course 1" "link" in the "region-main" "region" And I should see "1337" - And I log out And I am on the "Test assignment name" "assign activity" page logged in as student2 And I should not see "I'm the teacher first feedback" And I should not see "60.0" diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature index e46a4c0ca52..450ea075df1 100644 --- a/mod/assign/tests/behat/steps_blind_marking.feature +++ b/mod/assign/tests/behat/steps_blind_marking.feature @@ -60,10 +60,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I should see "Released" in the "I'm the student's first submission" "table_row" And I set the field "Grading action" to "Reveal student identities" And I press "Continue" - And I log out - - And I am on the "C1" Course page logged in as student1 - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then I should see "50" And I should see "Great job! Lol, not really." @@ -82,10 +79,7 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I press "Save changes" And I follow "View all submissions" And I should see "Released" in the "Student 1" "table_row" - And I log out - - And I am on the "C1" Course page logged in as student1 - And I navigate to "User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "student1" Then I should see "50" And I should see "Great job! Lol, not really." diff --git a/mod/h5pactivity/tests/behat/sending_attempt.feature b/mod/h5pactivity/tests/behat/sending_attempt.feature index a1b0f30c563..fb745091ea4 100644 --- a/mod/h5pactivity/tests/behat/sending_attempt.feature +++ b/mod/h5pactivity/tests/behat/sending_attempt.feature @@ -41,7 +41,6 @@ Feature: Do a H5P attempt And I click on "Correct one" "text" in the ".h5p-question-content" "css_element" And I click on "Check" "button" in the ".h5p-question-buttons" "css_element" And I switch to the main frame - And I log out And I am on the "Course 1" course page logged in as teacher1 And I navigate to course participants And I follow "Student 1" @@ -83,8 +82,7 @@ Feature: Do a H5P attempt And "2" row "Score" column of "table" table should contain "1" And "3" row "Score" column of "table" table should contain "0" And "4" row "Score" column of "table" table should contain "1" - And I am on the "Course 1" course page logged in as teacher1 - And I navigate to "View > User report" in the course gradebook + And I am on the "Course 1" "grades > User report > View" page logged in as "teacher1" And I click on "Student 1" in the "user" search widget Then the following should exist in the "user-grade" table: | Grade item | Grade | Percentage | diff --git a/mod/lti/tests/behat/lti_activity_completion.feature b/mod/lti/tests/behat/lti_activity_completion.feature index 46f34547775..fbdf3a7db52 100644 --- a/mod/lti/tests/behat/lti_activity_completion.feature +++ b/mod/lti/tests/behat/lti_activity_completion.feature @@ -30,8 +30,7 @@ Feature: View activity completion information in the LTI activity Given I am on the "Music history" "lti activity" page logged in as student1 And the "View" completion condition of "Music history" is displayed as "done" And the "Receive a grade" completion condition of "Music history" is displayed as "todo" - 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 "90.00" to the user "Vinnie Student1" for the grade item "Music history" And I press "Save changes" diff --git a/mod/lti/tests/behat/lti_completion_pass_grade.feature b/mod/lti/tests/behat/lti_completion_pass_grade.feature index bf4b65c1745..4c410e20169 100644 --- a/mod/lti/tests/behat/lti_completion_pass_grade.feature +++ b/mod/lti/tests/behat/lti_completion_pass_grade.feature @@ -33,8 +33,7 @@ Feature: Pass grade activity completion information in the LTI activity And the "View" completion condition of "Music history" is displayed as "done" And the "Receive a grade" completion condition of "Music history" is displayed as "todo" And the "Receive a passing grade" completion condition of "Music history" is displayed as "todo" - 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 "90.00" to the user "Vinnie Student1" for the grade item "Music history" And I give the grade "20.00" to the user "Vinnie Student2" for the grade item "Music history" diff --git a/user/tests/behat/user_grade_navigation.feature b/user/tests/behat/user_grade_navigation.feature index cc5be9ae0fa..837e3cb8f81 100644 --- a/user/tests/behat/user_grade_navigation.feature +++ b/user/tests/behat/user_grade_navigation.feature @@ -22,18 +22,15 @@ Feature: The student can navigate to their grades page and user grade report. | teacher1 | C1 | editingteacher | | student1 | C2 | student | And the following "activities" exist: - | activity | course | idnumber | name | intro | grade | - | assign | C1 | a1 | Test assignment one | Submit something! | 300 | - | assign | C1 | a2 | Test assignment two | Submit something! | 100 | - | assign | C1 | a3 | Test assignment three | Submit something! | 150 | - | assign | C2 | a4 | Test assignment four | Submit something! | 150 | - 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 turn editing mode on - And I give the grade "150.00" to the user "Student 1" for the grade item "Test assignment one" - And I give the grade "67.00" to the user "Student 1" for the grade item "Test assignment two" - And I press "Save changes" - And I log out + | activity | course | idnumber | name | grade | + | assign | C1 | a1 | Test assignment one | 300 | + | assign | C1 | a2 | Test assignment two | 100 | + | assign | C1 | a3 | Test assignment three | 150 | + | assign | C2 | a4 | Test assignment four | 150 | + And the following "grade grades" exist: + | gradeitem | user | grade | + | Test assignment one | student1 | 150.00 | + | Test assignment two | student1 | 67.00 | Scenario: Navigation to Grades and the user grade report. When I log in as "student1"