MDL-73639 behat: improvements to the new recover grades test

grade/tests/behat/grade_recovery_settings.feature

@@ -1,6 +1,6 @@
 @core @core_grades @javascript
 Feature: Admin can set Recover grades default setting
-  In order to recover grade
+  In order to recover grades
   As an admin
   I need to enable "Recover grades default" from site administration
 
@@ -19,19 +19,16 @@ Feature: Admin can set Recover grades default setting
       | assign   | C1     | Assign 1 |
 
   Scenario Outline: Recover grades default setting can be changed
-    Given I log in as "admin"
-    # Set Recover grades default value
-    And I set the following administration settings values:
-      | recovergradesdefault | <recovergradesetting> |
+    Given the following config values are set as admin:
+      | recovergradesdefault  | <recovergradesetting>  |
     # Grade student 1 via quick grading
-    And I am on the "Assign 1" "assign activity" page
+    And I am on the "Assign 1" "assign activity" page logged in as admin
     And I follow "View all submissions"
     And I click on "Quick grading" "checkbox"
     And I set the field "User grade" to "60.00"
     And I press "Save all quick grading changes"
     # Confirm that assigned grade was saved
-    And I am on the "Course 1" course page
-    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 should see "60.00" in the "Student One" "table_row"
     And I navigate to course participants
     And I click on "Unenrol" "icon" in the "Student One" "table_row"
@@ -45,7 +42,7 @@ Feature: Admin can set Recover grades default setting
     And I click on "Recover user's old grades if possible" "checkbox" in the "Enrol users" "dialogue"
     And I click on "Enrol users" "button" in the "Enrol users" "dialogue"
     # Confirm whether re-enrolled student's grade is recovered or not based on student enrolment settings
-    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 <gradevisibility> see "60.00" in the "Student One" "table_row"
 
     Examples: