Merge branch 'MDL-47726_27' of git://github.com/timhunt/moodle into MOODLE_27_STABLE

This commit is contained in:
Dan Poltawski
2014-10-20 17:26:38 +01:00
@@ -337,7 +337,8 @@ class availability_profile_condition_testcase extends advanced_testcase {
// The list of fields should include the text field added in setUp(),
// but should not include the textarea field added just now.
$fields = condition::get_custom_profile_fields();
$this->assertEquals(array('frogtype'), array_keys($fields));
$this->assertArrayHasKey('frogtype', $fields);
$this->assertArrayNotHasKey('longtext', $fields);
}
/**