MDL-57019 core_grades: change default navigation to tabs

without navigation block in boost it is not easy to navigation between gradebook sections

admin/settings/grades.php

@@ -53,7 +53,8 @@
                                                          '3' => '3',
                                                          '4' => '4',
                                                          '5' => '5')));
-        $temp->add(new admin_setting_configselect('grade_navmethod', new lang_string('navmethod', 'grades'), null, 0,
+        $temp->add(new admin_setting_configselect('grade_navmethod', new lang_string('navmethod', 'grades'), null,
+                                                  GRADE_NAVMETHOD_TABS,
                                                   array(GRADE_NAVMETHOD_DROPDOWN => new lang_string('dropdown', 'grades'),
                                                         GRADE_NAVMETHOD_TABS => new lang_string('tabs', 'grades'),
                                                         GRADE_NAVMETHOD_COMBO => new lang_string('combo', 'grades'))));

grade/export/txt/tests/behat/export.feature

@@ -29,7 +29,8 @@ Feature: I need to export grades as text
 
   @javascript
   Scenario: Export grades as text
-    When I set the field "Grade report" to "Plain text file"
+    When I follow "Export"
+    And I follow "Plain text file"
     And I expand all fieldsets
     And I click on "Course total" "checkbox"
     And I set the field "Grade export decimal points" to "1"
@@ -41,7 +42,8 @@ Feature: I need to export grades as text
 
   @javascript
   Scenario: Export grades as text using real
-    When I set the field "Grade report" to "Plain text file"
+    When I follow "Export"
+    And I follow "Plain text file"
     And I expand all fieldsets
     And  I set the following fields to these values:
       | Real        | 1                        |
@@ -52,7 +54,8 @@ Feature: I need to export grades as text
 
   @javascript
   Scenario: Export grades as text using percentages and letters
-    When I set the field "Grade report" to "Plain text file"
+    When I follow "Export"
+    And I follow "Plain text file"
     And  I set the following fields to these values:
       | Percentage   | 1                        |
       | Letter       | 1                        |
@@ -65,7 +68,8 @@ Feature: I need to export grades as text
 
   @javascript
   Scenario: Export grades as text using real, percentages and letters
-    When I set the field "Grade report" to "Plain text file"
+    When I follow "Export"
+    And I follow "Plain text file"
     And  I set the following fields to these values:
       | Real         | 1                        |
       | Percentage   | 1                        |

grade/report/grader/tests/behat/switch_views.feature

@@ -61,7 +61,6 @@ Feature: We can change what we are viewing on the grader report
     And I click on "Hide" "link" in the "Test assignment name 2" activity
     And I follow "Course 1"
     And I click on "Grades" "link" in the "Navigation" "block"
-    And I select "Grader report" from the "Grade report" singleselect
     And I should see "Test assignment name 1"
     And I should see "Test assignment name 2"
     And I should see "Course total"
@@ -98,7 +97,6 @@ Feature: We can change what we are viewing on the grader report
     And I log in as "teacher1"
     And I follow "Course 1"
     And I click on "Grades" "link" in the "Navigation" "block"
-    And I select "Grader report" from the "Grade report" singleselect
     And I should see "Test assignment name 1"
     And I should see "Test assignment name 2"
     And I should see "Course total"

grade/report/singleview/tests/behat/singleview.feature

@@ -56,7 +56,7 @@ Feature: We can use Single view
 
   @javascript
   Scenario: I can update grades, add feedback and exclude grades.
-    Given I select "Single view" from the "Grade report" singleselect
+    Given I follow "Single view"
     And I select "Student 4" from the "Select user..." singleselect
     And I set the field "Override for Test assignment one" to "1"
     When I set the following fields to these values:
@@ -98,7 +98,7 @@ Feature: We can use Single view
     And I log in as "teacher2"
     And I follow "Course 1"
     And I click on "Grades" "link" in the "Navigation" "block"
-    And I click on "Single view" "option"
+    And I follow "Single view"
     And I click on "Student 4" "option"
     And the "Exclude for Test assignment one" "checkbox" should be disabled
     And the "Override for Test assignment one" "checkbox" should be enabled

grade/report/user/tests/behat/view_usereport.feature

@@ -13,6 +13,6 @@ Feature: We can use the user report
       And I am on site homepage
       And I follow "Course 1"
       And I click on "Grades" "link" in the "Navigation" "block"
-      And I select "User report" from the "Grade report" singleselect
+      And I follow "User report"
       And I select "All users (0)" from the "Select all or one user" singleselect
       Then I should see "No students enrolled in this course yet"

grade/tests/behat/grade_aggregation.feature

@@ -242,7 +242,7 @@ Feature: We can use calculated grade totals
       | Aggregation                     | Natural |
       | Include outcomes in aggregation | 1       |
       | Exclude empty grades            | 0       |
-    And I follow "Grader report"
+    And I follow "View"
     And I give the grade "Excellent" to the user "Student 1" for the grade item "Test outcome item one"
     And I press "Save changes"
     And I navigate to "Course grade settings" node in "Grade administration > Setup"
@@ -307,7 +307,7 @@ Feature: We can use calculated grade totals
     And I set the following settings for grade item "Test outcome item one":
      | Weight adjusted  | 1   |
      | aggregationcoef2 | 100 |
-    And I follow "Grader report"
+    And I follow "View"
     And I give the grade "Excellent" to the user "Student 1" for the grade item "Test outcome item one"
     And I press "Save changes"
     And I navigate to "Course grade settings" node in "Grade administration > Setup"
@@ -344,7 +344,7 @@ Feature: We can use calculated grade totals
     And I set the field "Show contribution to course total" to "Show"
     And I set the field "Show weightings" to "Show"
     And I press "Save changes"
-    And I select "User report" from the "Grade report" singleselect
+    And I follow "User report"
     And I select "Myself" from the "View report as" singleselect
     And I select "Student 1" from the "Select all or one user" singleselect
     And the following should exist in the "user-grade" table:
@@ -412,7 +412,7 @@ Feature: We can use calculated grade totals
       | Item name | Manual item 3 |
       | Grade category | Sub category 3 |
     And I press "Save changes"
-    And I follow "Grader report"
+    And I follow "View"
     And I give the grade "60.00" to the user "Student 1" for the grade item "Manual item 1"
     And I give the grade "20.00" to the user "Student 1" for the grade item "Manual item 2"
     And I give the grade "40.00" to the user "Student 1" for the grade item "Manual item 3"
@@ -452,12 +452,12 @@ Feature: We can use calculated grade totals
       | Category name | Sub sub category 1 |
       | Parent category | Sub category 3 |
     And I press "Save changes"
-    And I follow "Grader report"
+    And I follow "View"
     And I should see "270.00 (24.77 %)" in the ".course" "css_element"
 
   @javascript
   Scenario: Natural aggregation from the setup screen
-    And I select "Gradebook setup" from the "Grade report" singleselect
+    And I follow "Setup"
     And I set the following settings for grade item "Course 1":
       | Aggregation          | Natural |
     And I set the following settings for grade item "Sub category 1":
@@ -519,7 +519,7 @@ Feature: We can use calculated grade totals
       | Aggregation          | Natural |
       | Exclude empty grades | 0       |
     And I turn editing mode off
-    And I select "Gradebook setup" from the "Grade report" singleselect
+    And I follow "Setup"
     And I set the field "Override weight of Test assignment one" to "1"
     And I set the field "Weight of Test assignment one" to "0"
     And I set the field "Override weight of Test assignment six" to "1"
@@ -534,7 +534,7 @@ Feature: We can use calculated grade totals
     And I set the field "Show weightings" to "Show"
     And I press "Save changes"
     Then I should see "75.00 (16.85 %)" in the ".course" "css_element"
-    And I select "User report" from the "Grade report" singleselect
+    And I follow "User report"
     And I select "Myself" from the "View report as" singleselect
     And I select "Student 1" from the "Select all or one user" singleselect
     And the following should exist in the "user-grade" table:

grade/tests/behat/grade_calculated_grade_items.feature

@@ -39,7 +39,7 @@ Feature: Calculated grade items can be used in the gradebook
       | grade item 1 | gi1 |
     And I set the following settings for grade item "Calc cat":
       | Maximum grade | 50 |
-    And I follow "Grader report"
+    And I follow "View"
     And I turn editing mode on
     And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1"
     And I press "Save changes"
@@ -66,8 +66,8 @@ Feature: Calculated grade items can be used in the gradebook
       | grade item 1 | gi1 |
     And I set the following settings for grade item "Calc cat":
       | Maximum grade | 50 |
-    And I follow "Grader report"
-    And I turn editing mode on
+    And I follow "View"
+    And I press "Turn editing on"
     And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1"
     And I press "Save changes"
     And I follow "User report"
@@ -80,6 +80,7 @@ Feature: Calculated grade items can be used in the gradebook
     And I navigate to "Gradebook setup" node in "Grade administration > Setup"
     And I set the following settings for grade item "Calc cat":
       | Maximum grade | 40 |
+    And I follow "View"
     And I follow "Grader report"
     And I give the grade "65.00" to the user "Student 2" for the grade item "grade item 1"
     And I press "Save changes"
@@ -132,8 +133,7 @@ Feature: Calculated grade items can be used in the gradebook
     And I set the following fields to these values:
       | Min and max grades used in calculation | Initial min and max grades |
     And I press "Save changes"
-    And I follow "Grader report"
-    And I turn editing mode on
+    And I press "Turn editing on"
     And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1"
     And I press "Save changes"
     And I follow "User report"
@@ -147,6 +147,7 @@ Feature: Calculated grade items can be used in the gradebook
     And I set the following settings for grade item "calc item":
       | Rescale existing grades | No |
       | Maximum grade | 40 |
+    And I follow "View"
     And I follow "Grader report"
     And I give the grade "65.00" to the user "Student 2" for the grade item "grade item 1"
     And I press "Save changes"

grade/tests/behat/grade_calculated_grade_items_20150627.feature

@@ -40,7 +40,6 @@ Feature: Gradebook calculations for calculated grade items before the fix 201506
       | grade item 1 | gi1 |
     And I set the following settings for grade item "Calc cat":
       | Maximum grade | 50 |
-    And I follow "Grader report"
     And I turn editing mode on
     And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1"
     And I press "Save changes"
@@ -67,8 +66,9 @@ Feature: Gradebook calculations for calculated grade items before the fix 201506
       | grade item 1 | gi1 |
     And I set the following settings for grade item "Calc cat":
       | Maximum grade | 50 |
+    And I follow "View"
     And I follow "Grader report"
-    And I turn editing mode on
+    And I press "Turn editing on"
     And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1"
     And I press "Save changes"
     And I follow "User report"
@@ -81,6 +81,7 @@ Feature: Gradebook calculations for calculated grade items before the fix 201506
     And I navigate to "Gradebook setup" node in "Grade administration > Setup"
     And I set the following settings for grade item "Calc cat":
       | Maximum grade | 40 |
+    And I follow "View"
     And I follow "Grader report"
     And I give the grade "65.00" to the user "Student 2" for the grade item "grade item 1"
     And I press "Save changes"
@@ -134,7 +135,7 @@ Feature: Gradebook calculations for calculated grade items before the fix 201506
       | Min and max grades used in calculation | Initial min and max grades |
     And I press "Save changes"
     And I follow "Grader report"
-    And I turn editing mode on
+    And I press "Turn editing on"
     And I give the grade "75.00" to the user "Student 1" for the grade item "grade item 1"
     And I press "Save changes"
     And I follow "User report"
@@ -148,6 +149,7 @@ Feature: Gradebook calculations for calculated grade items before the fix 201506
     And I set the following settings for grade item "calc item":
       | Rescale existing grades | No |
       | Maximum grade | 40 |
+    And I follow "View"
     And I follow "Grader report"
     And I give the grade "65.00" to the user "Student 2" for the grade item "grade item 1"
     And I press "Save changes"

grade/tests/behat/grade_calculated_weights.feature

@@ -43,7 +43,7 @@ Feature: We can understand the gradebook user report
     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"
-    And I set the field "Grade report" to "Gradebook setup"
+    And I follow "Setup"
     And I press "Add category"
     And I set the field "Category name" to "Sub category"
     And I press "Save changes"
@@ -59,7 +59,7 @@ Feature: We can understand the gradebook user report
   Scenario: Mean of grades aggregation
     And I set the following settings for grade item "Course 1":
       | Aggregation | Mean of grades |
-    And I set the field "Grade report" to "User report"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -84,7 +84,7 @@ Feature: We can understand the gradebook user report
       | Item weight | 1.0 |
     And I set the following settings for grade item "Sub category":
       | Item weight | 1.0 |
-    And I set the field "Grade report" to "User report"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -105,7 +105,8 @@ Feature: We can understand the gradebook user report
       | Aggregation | Simple weighted mean of grades |
     And I set the following settings for grade item "Test assignment three":
       | Extra credit | 1 |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -124,7 +125,8 @@ Feature: We can understand the gradebook user report
       | Aggregation | Mean of grades (with extra credits) |
     And I set the following settings for grade item "Test assignment three":
       | Extra credit weight | 1.0 |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -141,7 +143,8 @@ Feature: We can understand the gradebook user report
   Scenario: Median of grades aggregation
     And I set the following settings for grade item "Course 1":
       | Aggregation | Median of grades |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -158,7 +161,8 @@ Feature: We can understand the gradebook user report
   Scenario: Lowest grade aggregation
     And I set the following settings for grade item "Course 1":
       | Aggregation | Lowest grade |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -175,7 +179,8 @@ Feature: We can understand the gradebook user report
   Scenario: Highest grade aggregation
     And I set the following settings for grade item "Course 1":
       | Aggregation | Highest grade |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -192,7 +197,8 @@ Feature: We can understand the gradebook user report
   Scenario: Mode of grades aggregation
     And I set the following settings for grade item "Course 1":
       | Aggregation | Mode of grades |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -213,7 +219,8 @@ Feature: We can understand the gradebook user report
       | Aggregation | Weighted mean of grades |
     And I set the following settings for grade item "Test assignment three":
       | Extra credit | 1 |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.
@@ -232,7 +239,8 @@ Feature: We can understand the gradebook user report
   Scenario: View user report with natural aggregation
     And I set the following settings for grade item "Test assignment three":
       | Extra credit | 1 |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
 
     # Check the values in the weights column.

grade/tests/behat/grade_contribution_with_extra_credit.feature

@@ -56,7 +56,7 @@ Feature: Extra credit contributions are normalised when going out of bounds
     And I press "Save changes"
 
   Scenario Outline: The contribution of extra credit items is normalised
-    Given I set the field "Grade report" to "Gradebook setup"
+    Given I follow "Setup"
     When I set the following settings for grade item "Course 1":
       | Aggregation | <aggregation> |
     And I set the following settings for grade item "Manual item 2":
@@ -65,7 +65,8 @@ Feature: Extra credit contributions are normalised when going out of bounds
       | Extra credit | 1 |
     And I set the following settings for grade item "Manual item 4":
       | Extra credit | 1 |
-    And I set the field "Grade report" to "User report"
+    And I follow "View"
+    And I follow "User report"
     And I set the field "Select all or one user" to "Student 1"
     Then the following should exist in the "user-grade" table:
       | Grade item    | Calculated weight | Grade  | Contribution to course total |

grade/tests/behat/grade_hidden_items.feature

@@ -45,7 +45,7 @@ Feature: Student and teacher's view of aggregated grade items is consistent when
     And I press "Save changes"
     And I follow "Course 1"
     And I click on "Grades" "link" in the "Navigation" "block"
-    And I select "User report" from the "Grade report" singleselect
+    And I follow "User report"
     And I select "Myself" from the "View report as" singleselect
     And I select "Student 1" from the "Select all or one user" singleselect
     Then the following should exist in the "user-grade" table: