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

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

1 files changed, 22 insertions, 0 deletions

diff --git a/_test/tests/test/basic.test.php b/_test/tests/test/basic.test.php
new file mode 100644
index 000000000..b4926d2ba
--- /dev/null
+++ b/_test/tests/test/basic.test.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * @group integration
+ */
+class InttestsBasicTest extends DokuWikiTest {
+    /**
+     * Execute the simplest possible request and expect
+     * a dokuwiki page which obviously has the word "DokuWiki"
+     * in it somewhere.
+     */
+    function testSimpleRun() {
+        $request = new TestRequest();
+
+        $response = $request->execute();
+
+        $this->assertTrue(
+            strpos($response->getContent(), 'DokuWiki') >= 0,
+            'DokuWiki was not a word in the output'
+        );
+    }
+}