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

Merge branch 'MDL-59890-master-fix' of git://github.com/junpataleta/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2017-10-04 14:55:32 +08:00
parent 32c369818c 469c3b4645
commit 2c1be712a3
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
calendar/tests/behat/category_events.feature
+16 -12
View File
@@ -47,18 +47,22 @@ Feature: Course Category Events
| student2 | B1i | student |
| student2 | B2i | student |
And the following "events" exist:
| name | eventtype | category | course |
| Site event | global | | |
| FA event | category | faculty-a | |
| DA1 event | category | department-a1 | |
| DA2 event | category | department-a1 | |
| FB event | category | faculty-b | |
| DB1 event | category | department-b1 | |
| DB2 event | category | department-b1 | |
| CA1i event | course | | A1i |
| CA2i event | course | | A2i |
| CB1i event | course | | B1i |
| CB2i event | course | | B2i |
| name | eventtype |
| Site event | global |
And the following "events" exist:
| name | eventtype | course |
| CA1i event | course | A1i |
| CA2i event | course | A2i |
| CB1i event | course | B1i |
| CB2i event | course | B2i |
And the following "events" exist:
| name | eventtype | category |
| FA event | category | faculty-a |
| DA1 event | category | department-a1 |
| DA2 event | category | department-a1 |
| FB event | category | faculty-b |
| DB1 event | category | department-b1 |
| DB2 event | category | department-b1 |
@javascript
Scenario: Manager of a Category can see all child and parent events in their category
lib/tests/behat/behat_data_generators.php
+1 -1
View File
@@ -227,7 +227,7 @@ class behat_data_generators extends behat_base {
$methodname = 'get_' . $element . '_id';
// Not all the switch fields are required, default vars will be assigned by data generators.
if (!empty($elementdata[$element])) {
if (isset($elementdata[$element])) {
// Temp $id var to avoid problems when $element == $field.
$id = $this->{$methodname}($elementdata[$element]);
unset($elementdata[$element]);