L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Eloy Lafuente (stronk7)
2015-10-30 10:23:52 +01:00
parent ee0546291a 4b274a10c2
commit d708bf59e4
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
user/tests/behat/user_grade_navigation.feature
+1 -2
View File
@@ -61,7 +61,6 @@ Feature: The student can navigate to their grades page and user grade report.
And I follow "Grades"
Then I should see "My badges from Acceptance test site web site"
@javascript
Scenario: Log in as a parent and view a childs grades.
When I log in as "admin"
And I am on site homepage
@@ -84,7 +83,7 @@ Feature: The student can navigate to their grades page and user grade report.
And I click on "Preferences" "link" in the ".profile_tree" "css_element"
And I follow "Assign roles relative to this user"
And I follow "Parent"
And I click on "//select[@id='addselect']/descendant::option[contains(., 'Parent 1 (parent1@example.com)')]" "xpath_element"
And I set the field "Potential users" to "Parent 1 (parent1@example.com)"
And I click on "Add" "button"
And I log out
And I log in as "parent1"
user/tests/behat/view_preferences_page.feature
+1 -2
View File
@@ -53,7 +53,6 @@ Feature: Access to preferences page
And I follow "Student 2"
Then I should see "Preferences" in the "#region-main" "css_element"
@javascript
Scenario: A user with the appropriate permissions can view another user's permissions page.
Given I log in as "admin"
And I am on site homepage
@@ -76,7 +75,7 @@ Feature: Access to preferences page
And I click on "Preferences" "link" in the ".profile_tree" "css_element"
And I follow "Assign roles relative to this user"
And I follow "Parent"
And I click on "//select[@id='addselect']/descendant::option[contains(., 'Parent 1 (parent1@example.com)')]" "xpath_element"
And I set the field "Potential users" to "Parent 1 (parent1@example.com)"
And I click on "Add" "button"
And I log out
And I log in as "parent"