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

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

1 files changed, 18 insertions, 0 deletions

diff --git a/_test/tests/test/phpquery.test.php b/_test/tests/test/phpquery.test.php
new file mode 100644
index 000000000..188d834cb
--- /dev/null
+++ b/_test/tests/test/phpquery.test.php
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @group integration
+ */
+class InttestsPHPQueryTest extends DokuWikiTest {
+    /**
+     * Execute the simplest possible request and check the
+     * meta generator tag is set to "DokuWiki"
+     */
+    function testSimpleRun() {
+        $request = new TestRequest();
+
+        $response = $request->execute();
+
+        $this->assertEquals('DokuWiki', $response->queryHTML('meta[name="generator"]')->attr('content') );
+    }
+}