summaryrefslogtreecommitdiff
path: root/_testing/tests/testing
diff options
context:
space:
mode:
authorAndreas Gohr <gohr@cosmocode.de>2012-04-17 10:06:57 +0200
committerAndreas Gohr <gohr@cosmocode.de>2012-04-17 10:06:57 +0200
commitd8deaf4a82a59cfdcfb6de9b583196dc94095bfd (patch)
tree625ce870681795533bf5e29b73754dde0b4661c7 /_testing/tests/testing
parent3ab58ffe5551d68e5a34f8e29e55c5e0c2511570 (diff)
downloadrpg-d8deaf4a82a59cfdcfb6de9b583196dc94095bfd.tar.gz
rpg-d8deaf4a82a59cfdcfb6de9b583196dc94095bfd.tar.bz2
removed hook method from TestRequest
Diffstat (limited to '_testing/tests/testing')
-rw-r--r--_testing/tests/testing/inttests_hooks.test.php22
-rw-r--r--_testing/tests/testing/inttests_reset.test.php3
2 files changed, 14 insertions, 11 deletions
diff --git a/_testing/tests/testing/inttests_hooks.test.php b/_testing/tests/testing/inttests_hooks.test.php
index 98ca77e82..621b9f9b8 100644
--- a/_testing/tests/testing/inttests_hooks.test.php
+++ b/_testing/tests/testing/inttests_hooks.test.php
@@ -5,16 +5,20 @@
*/
class InttestsHooksTest extends DokuWikiTest {
- function testHookTriggering() {
- $request = new TestRequest();
+ function testHookTriggering() {
+ global $EVENT_HANDLER;
- $hookTriggered = false;
- $request->hook('TPL_CONTENT_DISPLAY', 'AFTER', function() use (&$hookTriggered) {
- $hookTriggered = true;
- });
+ $request = new TestRequest();
+ $hookTriggered = false;
- $request->execute();
+ $EVENT_HANDLER->register_hook('TPL_CONTENT_DISPLAY', 'AFTER', null,
+ function() use (&$hookTriggered) {
+ $hookTriggered = true;
+ }
+ );
- $this->assertTrue($hookTriggered, 'Hook was not triggered as expected!');
- }
+ $request->execute();
+
+ $this->assertTrue($hookTriggered, 'Hook was not triggered as expected!');
+ }
}
diff --git a/_testing/tests/testing/inttests_reset.test.php b/_testing/tests/testing/inttests_reset.test.php
index 2241421f5..7c5978543 100644
--- a/_testing/tests/testing/inttests_reset.test.php
+++ b/_testing/tests/testing/inttests_reset.test.php
@@ -12,9 +12,8 @@ class InttestsScopeTest extends DokuWikiTest {
$conf['foo'] = 'bar';
global $EVENT_HANDLER;
- $null = null;
$self = $this;
- $EVENT_HANDLER->register_hook('DOKUWIKI_STARTED', 'AFTER', $null,
+ $EVENT_HANDLER->register_hook('DOKUWIKI_STARTED', 'AFTER', null,
function() use ($self) {
$self->triggered = true;
}