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

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

2 files changed, 41 insertions, 0 deletions

diff --git a/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php b/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php
new file mode 100644
index 000000000..5982c6933
--- /dev/null
+++ b/lib/plugins/testing/_test/dummy_plugin_integration_test.test.php
@@ -0,0 +1,32 @@
+<?php
+
+/**
+ * @group integration
+ */
+class TestingDummyPluginIntegrationTest extends DokuWikiTest {
+
+    function setUp() {
+        $this->pluginsEnabled = array(
+            'testing'
+        );
+
+        parent::setUp();
+    }
+
+    function testTestingPluginEnabled() {
+        global $EVENT_HANDLER;
+
+        $request = new TestRequest();
+        $hookTriggered = false;
+
+        $EVENT_HANDLER->register_hook('TESTING_PLUGIN_INSTALLED', 'AFTER', null,
+            function() use (&$hookTriggered) {
+                $hookTriggered = true;
+            }
+        );
+
+        $request->execute();
+
+        $this->assertTrue($hookTriggered, 'Testing plugin did not trigger!');
+    }
+}
diff --git a/lib/plugins/testing/_test/dummy_plugin_test.test.php b/lib/plugins/testing/_test/dummy_plugin_test.test.php
new file mode 100644
index 000000000..eee825fbd
--- /dev/null
+++ b/lib/plugins/testing/_test/dummy_plugin_test.test.php
@@ -0,0 +1,9 @@
+<?php
+
+class TestingDummyPluginTest extends DokuWikiTest {
+
+    function testNothing() {
+        $this->assertTrue(true, 'wow, you really fucked up');
+    }
+
+}