Permalink
Browse files

Merge branch 'wip-MDL-28137-master' of git://github.com/samhemelryk/m…

…oodle
  • Loading branch information...
2 parents c051470 + f50243e commit 6857b0db47c72cdb4838a0992395c3d2f2e58399 @skodak skodak committed Jul 18, 2011
Showing with 15 additions and 0 deletions.
  1. +15 −0 lib/simpletest/testblocklib_blockmanager.php
@@ -159,13 +159,28 @@ public function test_matching_page_type_patterns() {
*/
class moodle_block_manager_test_saving_loading extends UnitTestCaseUsingDatabase {
+ protected $isediting = null;
+
public function setUp() {
+ global $USER;
+ if (!empty($USER->editing)) {
+ // We want to avoid the capability checks associated with
+ // checking the user is editing.
+ $this->isediting = $USER->editing;
+ unset($USER->editing);
+ }
parent::setUp();
$this->create_test_tables(array('block', 'block_instances', 'block_positions', 'context'), 'lib');
$this->switch_to_test_db();
}
public function tearDown() {
+ global $USER;
+ if (!empty($this->isediting)) {
+ // Replace $USER->editing as it was there at setup.
+ $USER->editing = $this->isediting;
+ $this->isediting = null;
+ }
parent::tearDown();
}

0 comments on commit 6857b0d

Please sign in to comment.