MDL-47064 Grades: Add contribution to course total to behat test.

Part of: MDL-46576

diff --git a/grade/tests/behat/grade_aggregation.feature b/grade/tests/behat/grade_aggregation.feature
index 22e248d..cab092a 100644 (file)
--- a/grade/tests/behat/grade_aggregation.feature
+++ b/grade/tests/behat/grade_aggregation.feature
@@ -246,7 +246,7 @@ Feature: We can use calculated grade totals
     And I set the field "Grade report" to "Overview report"
     And I should see "50.00 (50.00 %)" in the "overview-grade" "table"
 
-  @javascript @wip
+  @javascript
   Scenario: Natural aggregation
     And I set the following settings for grade item "Sub category 1":
       | Aggregation          | Natural |
@@ -273,16 +273,16 @@ Feature: We can use calculated grade totals
     And I set the field "Grade report" to "User report"
     And the following should exist in the "user-grade" table:
       | Grade item | Calculated weight | Grade | Range |
-      | Test assignment five | 28.57 % | 10.00 (50.00 %) | 0–20 |
-      | Test assignment six | 50.00 % | 5.00 (50.00 %) | 0–10 |
-      | Test assignment seven | 21.43 % | - | 0–15 |
-      | Test assignment eight | 66.67 % | 10.00 (50.00 %) | 0–20 |
-      | Test assignment nine | 33.33 % | 5.00 (50.00 %) | 0–10 |
-      | Test assignment ten | -( Empty ) | - | 0–15 |
-      | Test assignment one | 48.00 % | 60.00 (20.00 %) | 0–300 |
-      | Test assignment two | 16.00 % | 20.00 (20.00 %) | 0–100 |
-      | Test assignment three | 24.00 %( Extra credit ) | 40.00 (26.67 %) | 0–150 |
-      | Test assignment four | 24.00 % | - | 0–150 |
+      | Test assignment five | 28.57 % | 10.00 (50.00 %) | 0–20 | 6.43 |
+      | Test assignment six | 50.00 % | 5.00 (50.00 %) | 0–10 | 11.25 |
+      | Test assignment seven | 21.43 % | - | 0–15 | 0.00 |
+      | Test assignment eight | 66.67 % | 10.00 (50.00 %) | 0–20 | 10.00 |
+      | Test assignment nine | 33.33 % | 5.00 (50.00 %) | 0–10 | 5.00 |
+      | Test assignment ten | -( Empty ) | - | 0–15 | 0.00 |
+      | Test assignment one | 48.00 % | 60.00 (20.00 %) | 0–300 | 60.00 |
+      | Test assignment two | 16.00 % | 20.00 (20.00 %) | 0–100 | 20.00 |
+      | Test assignment three | 24.00 %( Extra credit ) | 40.00 (26.67 %) | 0–150 | 40.00 |
+      | Test assignment four | 24.00 % | - | 0–150 | 0.00 |
     And I log out
     And I log in as "student1"
     And I follow "Course 1"
@@ -291,14 +291,14 @@ Feature: We can use calculated grade totals
     And I should see "113.75 (23.45 %)" in the "overview-grade" "table"
     And I set the field "Grade report" to "User report"
     And the following should exist in the "user-grade" table:
-      | Grade item | Calculated weight | Grade | Range |
-      | Test assignment six | 70.00 % | 5.00 (50.00 %) | 0–10 |
-      | Test assignment seven | 30.00 % | - | 0–15 |
-      | Test assignment nine | 100.00 % | 5.00 (50.00 %) | 0–10 |
-      | Test assignment ten | -( Empty ) | - | 0–15 |
-      | Test assignment one | 61.86 % | 60.00 (20.00 %) | 0–300 |
-      | Test assignment three | 30.93 %( Extra credit ) | 40.00 (26.67 %) | 0–150 |
-      | Test assignment four | 30.93 % | - | 0–150 |
+      | Grade item | Calculated weight | Grade | Range | Contribution to course total |
+      | Test assignment six | 70.00 % | 5.00 (50.00 %) | 0–10 | 8.75 |
+      | Test assignment seven | 30.00 % | - | 0–15 | 0.00 |
+      | Test assignment nine | 100.00 % | 5.00 (50.00 %) | 0–10 | 5.00 |
+      | Test assignment ten | -( Empty ) | - | 0–15 | 0.00 |
+      | Test assignment one | 61.86 % | 60.00 (20.00 %) | 0–300 | 60.0 |
+      | Test assignment three | 30.93 %( Extra credit ) | 40.00 (26.67 %) | 0–150 | 40.0 |
+      | Test assignment four | 30.93 % | - | 0–150 | 0.00 |
 
   @javascript
   Scenario: Natural aggregation with drop lowest