Merge branch 'MDL-45893-master-fixup' of https://github.com/FMCorz/moodle

This commit is contained in:
Dan Poltawski 2014-10-08 10:42:20 +01:00
commit 73c07a7c97
6 changed files with 12 additions and 12 deletions

View File

@ -22,7 +22,7 @@ Feature: Test expand my courses navigation setting
Scenario: The My Courses branch is expanded on the My Moodle page by default
When I log in as "student1"
And I follow "My home"
And I click on "My home" "link" in the "Navigation" "block"
Then I should see "c1" in the "Navigation" "block"
And I should see "c2" in the "Navigation" "block"
And I should not see "c3" in the "Navigation" "block"
@ -33,8 +33,8 @@ Feature: Test expand my courses navigation setting
And I set the following administration settings values:
| Show My courses expanded on My home | 0 |
And I log out
Given I log in as "student1"
And I follow "My home"
When I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
Then I should not see "c1" in the "Navigation" "block"
And I should not see "c2" in the "Navigation" "block"
And I should not see "c3" in the "Navigation" "block"
@ -45,8 +45,8 @@ Feature: Test expand my courses navigation setting
And I set the following administration settings values:
| Show My courses expanded on My home | 0 |
And I log out
Given I log in as "student1"
And I follow "My home"
When I log in as "student1"
And I click on "My home" "link" in the "Navigation" "block"
And I should not see "c1" in the "Navigation" "block"
And I should not see "c2" in the "Navigation" "block"
And I should not see "c3" in the "Navigation" "block"

View File

@ -37,7 +37,7 @@ Feature: View my courses in navigation block
| Show my course categories | 0 |
And I log out
And I log in as "student1"
When I follow "My home"
When I click on "My home" "link" in the "Navigation" "block"
Then I should not see "cat1" in the "Navigation" "block"
And I should not see "cat2" in the "Navigation" "block"
And I should see "c1" in the "Navigation" "block"
@ -53,7 +53,7 @@ Feature: View my courses in navigation block
| Show my course categories | 1 |
And I log out
And I log in as "student1"
When I follow "My home"
When I click on "My home" "link" in the "Navigation" "block"
Then I should see "cat1" in the "Navigation" "block"
And I should see "cat3" in the "Navigation" "block"
And I should not see "cat2" in the "Navigation" "block"

View File

@ -17,7 +17,7 @@ Feature: Add blocks to my home page
| student1 | C1 | student |
| student2 | C1 | student |
And I log in as "student1"
And I follow "My home"
And I click on "My home" "link" in the "Navigation" "block"
Scenario: Add blocks to page
When I press "Customise this page"

View File

@ -17,7 +17,7 @@ Feature: Reset my home page to default
| student1 | C1 | student |
| student2 | C1 | student |
And I log in as "student1"
And I follow "My home"
And I click on "My home" "link" in the "Navigation" "block"
Scenario: Add blocks to page and reset
When I press "Customise this page"

View File

@ -18,7 +18,7 @@ Feature: Restrict which blocks can be added to My home
Scenario: The comments block can be added to My home by default
And I log in as "student1"
And I follow "My home"
And I click on "My home" "link" in the "Navigation" "block"
And I press "Customise this page"
Then the "Add a block" select box should contain "Comments"
And the "Add a block" select box should contain "Courses"
@ -34,7 +34,7 @@ Feature: Restrict which blocks can be added to My home
| block/html:myaddinstance | Prohibit |
And I log out
And I log in as "student1"
And I follow "My home"
And I click on "My home" "link" in the "Navigation" "block"
And I press "Customise this page"
Then the "Add a block" select box should not contain "Comments"
And the "Add a block" select box should not contain "Courses"

View File

@ -7,7 +7,7 @@ Feature: Enable/disable password field based on authentication selected.
@javascript
Scenario: Verify the password field is enabled/disabled based on authentication selected, in user edit advanced page.
Given I log in as "admin"
And I follow "My home"
And I click on "My home" "link" in the "Navigation" "block"
When I navigate to "Add a new user" node in "Site administration > Users > Accounts"
Then the "newpassword" "field" should be enabled
And I set the field "auth" to "Web services authentication"