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

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

4 files changed, 66 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');
+    }
+
+}
diff --git a/lib/plugins/testing/action.php b/lib/plugins/testing/action.php
new file mode 100644
index 000000000..e829847b6
--- /dev/null
+++ b/lib/plugins/testing/action.php
@@ -0,0 +1,19 @@
+<?php
+/**
+ * Plugin for testing the test system
+ *
+ * This plugin doesn't really do anything and should always be disabled
+ *
+ * @author Tobias Sarnowski <tobias@trustedco.de>
+ */
+class action_plugin_testing extends DokuWiki_Action_Plugin {
+    function register(&$controller) {
+        $controller->register_hook('DOKUWIKI_STARTED', 'AFTER', $this, 'dokuwikiStarted');
+    }
+
+    function dokuwikiStarted() {
+        $param = array();
+        trigger_event('TESTING_PLUGIN_INSTALLED', $param);
+        msg('The testing plugin is enabled and should be disabled.',-1);
+    }
+}
diff --git a/lib/plugins/testing/plugin.info.txt b/lib/plugins/testing/plugin.info.txt
new file mode 100644
index 000000000..a514d7774
--- /dev/null
+++ b/lib/plugins/testing/plugin.info.txt
@@ -0,0 +1,6 @@
+base   testing
+author Tobias Sarnowski
+email  tobias@trustedco.de
+date   2012-04-24
+name   Testing Plugin
+desc   Used to test the test framework. Should always be disabled.