Skip to content

Commit

Permalink
MDL-55356 search: Merge conflict fix
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewnicols committed Oct 12, 2017
1 parent ed15e64 commit c1c6ed1
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions search/tests/manager_test.php
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,7 @@ public function test_context_indexing() {
$buffer->reset_buffer();
$this->assertNotFalse(strpos($log, "area: Forum - posts\n Processed 2 "));
$this->assertTrue($result->complete);
}

/**
* Adding this test here as get_areas_user_accesses process is the same, results just depend on the context level.
Expand Down

0 comments on commit c1c6ed1

Please sign in to comment.