Merge branch 'master' of github.com:splitbrain/dokuwiki into frontend_improvements

Conflicts:
	lib/tpl/dokuwiki/css/basic.css

1 files changed, 38 insertions, 0 deletions

diff --git a/_test/tests/test/reset.test.php b/_test/tests/test/reset.test.php
new file mode 100644
index 000000000..39c43cd3b
--- /dev/null
+++ b/_test/tests/test/reset.test.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @group integration
+ */
+class InttestsScopeTest extends DokuWikiTest {
+
+    public $triggered = false;
+
+    function testFirstRun(){
+        global $conf;
+        $conf['foo'] = 'bar';
+
+        global $EVENT_HANDLER;
+        $self = $this;
+        $EVENT_HANDLER->register_hook('DOKUWIKI_STARTED', 'AFTER', null,
+            function() use ($self) {
+                $self->triggered = true;
+            }
+        );
+        $request = new TestRequest();
+        $request->execute();
+        $this->assertTrue($this->triggered);
+    }
+
+    /**
+     * @depends testFirstRun
+     */
+    function testSecondRun(){
+        global $conf;
+        $this->assertFalse(isset($conf['foo']), 'conf setting');
+
+        $request = new TestRequest();
+        $request->execute();
+
+        $this->assertFalse($this->triggered, 'trigger');
+    }
+}