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

Merge branch 'wip-mdl-43835' of https://github.com/rajeshtaneja/moodle

Browse Source
This commit is contained in:
Damyon Wiese 2014-06-25 13:55:19 +08:00
commit c33634c7e4
9 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backup/util/ui/tests/behat/backup_courses.feature
View File

@ -29,8 +29,7 @@ Feature: Backup Moodle courses
When I backup "Course 1" course using this options:
| Initial | Include calendar events | 0 |
| Initial | Include course logs | 1 |
| Schema | setting_section_section_5_userinfo | 0 |
| Schema | setting_section_section_5_included | 0 |
| Schema | Topic 5 | 0 |
| Confirmation | Filename | test_backup.mbz |
Then I should see "Restore"
And I click on "Restore" "link" in the "test_backup.mbz" "table_row"
@ -50,10 +49,8 @@ Feature: Backup Moodle courses
@javascript
Scenario: Backup selecting just one section
When I backup "Course 2" course using this options:
| Schema | setting_section_section_2_userinfo | 0 |
| Schema | setting_section_section_2_userinfo | 0 |
| Schema | setting_section_section_4_included | 0 |
| Schema | setting_section_section_4_included | 0 |
| Schema | Test data | 0 |
| Schema | Topic 2 | 0 |
| Confirmation | Filename | test_backup.mbz |
Then I should see "Course backup area"
And I click on "Restore" "link" in the "test_backup.mbz" "table_row"

9
backup/util/ui/tests/behat/restore_moodle2_courses.feature
View File

@ -52,10 +52,8 @@ Feature: Restore Moodle 2 course backups
When I backup "Course 3" course using this options:
| Confirmation | Filename | test_backup.mbz |
And I restore "test_backup.mbz" backup into "Course 2" course using this options:
| Schema | setting_section_section_3_included | 0 |
| Schema | setting_section_section_3_userinfo | 0 |
| Schema | setting_section_section_5_included | 0 |
| Schema | setting_section_section_5_userinfo | 0 |
| Schema | Test database name | 0 |
| Schema | Section 2 | 0 |
Then I should see "Course 2"
And I should see "Test assign name"
And I should not see "Test database name"
@ -70,8 +68,7 @@ Feature: Restore Moodle 2 course backups
| Description | Test forum post backup description |
And I follow "Restore"
And I merge "test_backup.mbz" backup into the current course after deleting it's contents using this options:
| Schema | setting_section_section_8_userinfo | 0 |
| Schema | setting_section_section_8_included | 0 |
| Schema | Section 3 | 0 |
Then I should see "Course 1"
And I should not see "Section 3"
And I should not see "Test forum post backup name"

11
badges/tests/behat/add_badge.feature
View File

@ -10,9 +10,7 @@ Feature: Add badges to the system
@javascript
Scenario: Setting badges settings
Given I expand "Site administration" node
And I expand "Badges" node
And I follow "Badges settings"
Given I navigate to "Badges settings" node in "Site administration > Badges"
And I set the field "Default badge issuer name" to "Test Badge Site"
And I set the field "Default badge issuer contact details" to "testuser@test-badge-site.com"
And I press "Save changes"
@ -22,15 +20,12 @@ Feature: Add badges to the system
@javascript
Scenario: Accessing the badges
Given I expand "Site pages" node
And I follow "Site badges"
Given I navigate to "Site badges" node in "Site pages"
Then I should see "There are no badges available."
@javascript
Scenario: Add a badge
Given I expand "Site administration" node
And I expand "Badges" node
And I follow "Add a new badge"
Given I navigate to "Add a new badge" node in "Site administration > Badges"
And I set the following fields to these values:
| Name | Test Badge |
| Description | Test badge description |

9
badges/tests/behat/award_badge.feature
View File

@ -85,7 +85,7 @@ Feature: Award badges
| student2 | C1 | student |
And I log in as "teacher1"
And I follow "Course 1"
And I click on "//span[text()='Badges']" "xpath_element" in the "Administration" "block"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I follow "Add a new badge"
And I set the following fields to these values:
| Name | Course Badge |
@ -142,7 +142,7 @@ Feature: Award badges
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I click on "//span[text()='Badges']" "xpath_element" in the "Administration" "block"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I follow "Add a new badge"
And I set the following fields to these values:
| Name | Course Badge |
@ -203,7 +203,7 @@ Feature: Award badges
And I log out
And I log in as "teacher1"
And I follow "Course 1"
And I click on "//span[text()='Badges']" "xpath_element" in the "Administration" "block"
And I navigate to "Add a new badge" node in "Course administration > Badges"
And I follow "Add a new badge"
And I set the following fields to these values:
| Name | Course Badge |
@ -212,8 +212,7 @@ Feature: Award badges
And I upload "badges/tests/behat/badge.png" file to "Image" filemanager
And I press "Create badge"
And I set the field "type" to "Course completion"
And I set the following fields to these values:
| grade_2 | 0 |
And I set the field with xpath "//fieldset/input[1]" to "0"
And I press "Save"
And I press "Enable access"
When I press "Continue"

2
completion/tests/behat/restrict_activity_by_grade.feature
View File

@ -39,7 +39,7 @@ Feature: Restrict activity availability through grade conditions
| Name | Test page name |
| Description | Restricted page, till grades in Grade assignment is at least 20% |
| Page content | Test page contents |
| id | 2 |
| id | Grade assignment |
| minval | 20 |
And I press "Save and return to course"
And I log out

2
completion/tests/behat/restrict_section_availability.feature
View File

@ -75,7 +75,7 @@ Feature: Restrict sections availability through completion or grade conditions
And I click on "Grade" "button" in the "Add restriction..." "dialogue"
And I click on "min" "checkbox"
And I set the following fields to these values:
| id | 2 |
| id | Grade assignment |
| minval | 20 |
And I press "Save changes"
And I log out

4
grade/tests/behat/grade_point_maximum.feature
View File

@ -57,10 +57,10 @@ Feature: We can change the grading type and maximum grade point values
And I follow "Edit settings"
And I expand all fieldsets
And I set the field "grade[modgrade_type]" to "Scale"
And I set the field "grade[modgrade_scale]" to "1"
And I set the field "grade[modgrade_scale]" to "Separate and Connected ways of knowing"
And I press "Save and display"
And I follow "Edit settings"
Then the field "grade[modgrade_scale]" matches value "1"
Then the field "grade[modgrade_scale]" matches value "Separate and Connected ways of knowing"
And the "Maximum points" "field" should be disabled
And I press "Save and return to course"

2
lib/behat/form_field/behat_form_select.php
View File

@ -278,7 +278,7 @@ class behat_form_select extends behat_form_field {
*/
protected function get_selected_options($returntexts = true) {
$method = 'getText';
$method = 'getHtml';
if ($returntexts === false) {
$method = 'getValue';
}

19
lib/tests/behat/behat_forms.php
View File

@ -155,6 +155,25 @@ class behat_forms extends behat_base {
$this->set_field_value($field, $value);
}
/**
* Sets the specified value to the field with xpath.
*
* @Given /^I set the field with xpath "(?P<fieldxpath_string>(?:[^"]|\\")*)" to "(?P<field_value_string>(?:[^"]|\\")*)"$/
* @throws ElementNotFoundException Thrown by behat_base::find
* @param string $field
* @param string $value
* @return void
*/
public function i_set_the_field_with_xpath_to($fieldxpath, $value) {
try {
$fieldNode = $this->find('xpath', $fieldxpath);
} catch (\Behat\Mink\Exception\ElementNotFoundException $e) {
throw new ElementNotFoundException('Field with xpath ' . $fieldxpath . 'not found, so can\'t be set');
}
$field = behat_field_manager::get_form_field($fieldNode, $this->getSession());
$field->set_value($value);
}
/**
* Checks, the field matches the value. More info in http://docs.moodle.org/dev/Acceptance_testing#Providing_values_to_steps.
*