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

Merge branch 'MDL-38346_master-fix' of git://github.com/dmonllao/moodle

Browse Source
This commit is contained in:
Damyon Wiese
2013-03-12 16:11:38 +08:00
parent 43c791653b 7532ea010a
commit 3de89ef8ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blocks/tests/behat/restrict_available_blocks.feature
+4 -4
View File
@@ -10,7 +10,7 @@ Feature: Allowed blocks controls
| teacher1 | Teacher | 1 | teacher1@asd.com |
And the following "courses" exists:
| fullname | shortname | category |
| Course $NASTYSTRING1 | C1 | 0 |
| Course 1 | C1 | 0 |
And the following "course enrolments" exists:
| user | course | role |
| teacher1 | C1 | editingteacher |
@@ -18,7 +18,7 @@ Feature: Allowed blocks controls
@javascript
Scenario: Blocks can be added with the default permissions
Given I log in as "teacher1"
And I follow "Course $NASTYSTRING1"
And I follow "Course 1"
And I turn editing mode on
When I add the "Course completion status" block
And I add the "Activities" block
@@ -31,14 +31,14 @@ Feature: Allowed blocks controls
And I set the following system permissions of "Teacher" role:
| block/activity_modules:addinstance | Prohibit |
And I am on homepage
And I follow "Course $NASTYSTRING1"
And I follow "Course 1"
And I expand "Users" node
And I follow "Permissions"
And I override the system permissions of "Teacher" role with:
| block/completionstatus:addinstance | Prohibit |
And I log out
When I log in as "teacher1"
And I follow "Course $NASTYSTRING1"
And I follow "Course 1"
And I turn editing mode on
Then the "Add a block" select box should not contain "Activities"
And the "Add a block" select box should not contain "Course completion status"