Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle

This commit is contained in:
Dan Poltawski 2012-05-14 13:36:11 +08:00
commit 3359a6fe07
6 changed files with 49 additions and 7 deletions

View file

@ -70,8 +70,8 @@ class mod_assignment_generator_testcase extends advanced_testcase {
$this->assertEquals(GRADE_TYPE_VALUE, $gitem->gradetype);
// test eventslib integration
$this->setUser(2); // admin
$this->setAdminUser();
$generator->create_instance(array('course'=>$course->id, 'timedue'=>(time()+60*60+24)));
$this->setUser(0);
$this->setUser(null);
}
}

View file

@ -43,7 +43,7 @@ class workshopform_rubric_strategy_test extends advanced_testcase {
* Setup testing environment
*/
protected function setUp() {
parent::setUser();
parent::setUp();
$cm = new stdclass();
$course = new stdclass();
$context = new stdclass();