mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-24 18:04:43 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-78673-master' of https://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Sara Arjona 2023-07-12 18:18:03 +02:00
commit f01927885f
No known key found for this signature in database
4 changed files with 105 additions and 45 deletions

64
grade/tests/behat/behat_grades.php

@ -49,6 +49,70 @@ class behat_grades extends behat_base {
];
}
/**
* Convert page names to URLs for steps like 'When I am on the "[identifier]" "[page type]" page'.
*
* Recognised page names are:
* | pagetype | name meaning | description |
* | [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 |
*
* @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"
* @return moodle_url the corresponding URL.
*/
protected function resolve_page_instance_url(string $type, string $identifier): moodle_url {
$type = strtolower($type);
if (strpos($type, '>') !== false) {
[$pluginname, $type] = explode('>', $type);
$pluginname = strtolower(trim($pluginname));
// Fetch the list of plugins.
$plugins = \core_component::get_plugin_list('gradereport');
if (array_key_exists($pluginname, $plugins)) {
$plugin = $pluginname;
} else {
$plugins = array_combine(
array_keys($plugins),
array_keys($plugins),
);
// This plugin is not in the list of plugins. Check the pluginname string.
$names = array_map(fn($name) => strtolower(get_string('pluginname', "gradereport_{$name}")), $plugins);
$result = array_search($pluginname, $names);
if ($result === false) {
throw new \coding_exception("Unknown plugin '{$pluginname}'");
}
$plugin = $result;
}
}
$type = trim($type);
switch ($type) {
case 'view':
return new moodle_url(
"/grade/report/{$plugin}/index.php",
['id' => $this->get_course_id($identifier)]
);
case 'gradebook setup':
return new moodle_url(
"/grade/edit/tree/index.php",
['id' => $this->get_course_id($identifier)]
);
case 'course grade settings':
return new moodle_url(
"/grade/edit/settings/index.php",
['id' => $this->get_course_id($identifier)]
);
default:
throw new \coding_exception(
"Unknown page type '$type' for page identifier '$identifier'"
);
}
}
/**
* Select a given element within a specific container instance.
*

72
grade/tests/behat/grade_average.feature

@ -1,64 +1,50 @@
@core @core_grades @javascript
Feature: Average grades are displayed in the gradebook
In order to check the expected results are displayed
As an admin
I need to assign grades and check that they display correctly in the gradebook.
In order to check the expected results are displayed
As an admin
I need to assign grades and check that they display correctly in the gradebook.
Background:
Given the following "courses" exist:
| fullname | shortname | format |
| Course 1 | C1 | topics |
| Course 1 | C1 | topics |
And the following "users" exist:
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
| student3 | Student | 3 | student3@example.com |
| username | firstname | lastname | email |
| teacher1 | Teacher | 1 | teacher1@example.com |
| student1 | Student | 1 | student1@example.com |
| student2 | Student | 2 | student2@example.com |
| student3 | Student | 3 | student3@example.com |
And the following "course enrolments" exist:
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
And I log in as "admin"
And I am on "Course 1" course homepage
| user | course | role |
| teacher1 | C1 | editingteacher |
| student1 | C1 | student |
| student2 | C1 | student |
| student3 | C1 | student |
And the following "grade item" exists:
| course | C1 |
| itemname | Manual item 1 |
And the following "grade grades" exist:
| gradeitem | user | grade |
| Manual item 1 | student1 | 50.00 |
| Manual item 1 | student2 | 50.00 |
| Manual item 1 | student3 | 50.00 |
And the following "course enrolments" exist:
| user | course | role | status |
| student2 | C1 | student | suspended |
# Enable averages
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:
| Show average | Show |
And I press "Save changes"
# Add a manual grade item
And I navigate to "Setup > Gradebook setup" in the course gradebook
And I press "Add grade item"
And I set the following fields to these values:
| Item name | Manual item 1 |
And I click on "Save" "button" in the "New grade item" "dialogue"
# Give all student the same grade for the manual grade item
And I navigate to "View > Grader report" in the course gradebook
And I turn editing mode on
And I give the grade "50.00" to the user "Student 1" for the grade item "Manual item 1"
And I give the grade "50.00" to the user "Student 2" for the grade item "Manual item 1"
And I give the grade "50.00" to the user "Student 3" for the grade item "Manual item 1"
And I press "Save changes"
And I turn editing mode off
# Suspend a user
And I am on the "Course 1" "enrolled users" page
And I click on "Edit enrolment" "link" in the "Student 2" "table_row"
And I set the following fields to these values:
| Status | Suspended |
And I press "Save changes"
Scenario: Grade a grade item and ensure the results display correctly in the gradebook
# Check the admin grade table
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 "admin"
Then I should see "50.00" in the ".avg.r0.lastrow .c1" "css_element"
Then I should see "50.00" in the ".avg.r0.lastrow .c2" "css_element"
And I log out
# Check the user grade table
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 > View" page logged in as "student1"
Then I should see "50.00" in the ".level2.column-grade" "css_element"
Then I should see "50.00" in the ".level2.column-average" "css_element"
And I log out

10
lib/behat/classes/behat_core_generator.php

@ -613,6 +613,16 @@ class behat_core_generator extends behat_generator_base {
if (!isset($data['status'])) {
$data['status'] = null;
} else {
$status = strtolower($data['status']);
switch ($status) {
case 'active':
$data['status'] = ENROL_USER_ACTIVE;
break;
case 'suspended':
$data['status'] = ENROL_USER_SUSPENDED;
break;
}
}
// If the provided course shortname is the site shortname we consider it a system role assign.

4
lib/tests/behat/behat_navigation.php

@ -620,8 +620,8 @@ class behat_navigation extends behat_base {
$dividercount = substr_count($page, ' > ');
if ($dividercount === 0) {
return ['core', $page];
} else if ($dividercount === 1) {
list($component, $name) = explode(' > ', $page);
} else if ($dividercount >= 1) {
[$component, $name] = explode(' > ', $page, 2);
if ($component === 'core') {
throw new coding_exception('Do not specify the component "core > ..." for core pages.');
}