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

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

1 files changed, 26 insertions, 0 deletions

diff --git a/_test/tests/inc/common_obfuscate.test.php b/_test/tests/inc/common_obfuscate.test.php
new file mode 100644
index 000000000..b8ec70980
--- /dev/null
+++ b/_test/tests/inc/common_obfuscate.test.php
@@ -0,0 +1,26 @@
+<?php
+
+class common_obfuscate_test extends DokuWikiTest {
+
+    function test_none(){
+        global $conf;
+        $conf['mailguard'] = 'none';
+        $this->assertEquals(obfuscate('jon-doe@example.com'), 'jon-doe@example.com');
+    }
+
+    function test_hex(){
+        global $conf;
+        $conf['mailguard'] = 'hex';
+        $this->assertEquals(obfuscate('jon-doe@example.com'),
+        '&#x6a;&#x6f;&#x6e;&#x2d;&#x64;&#x6f;&#x65;&#x40;&#x65;&#x78;&#x61;&#x6d;&#x70;&#x6c;&#x65;&#x2e;&#x63;&#x6f;&#x6d;');
+    }
+
+    function test_visible(){
+        global $conf;
+        $conf['mailguard'] = 'visible';
+        $this->assertEquals(obfuscate('jon-doe@example.com'), 'jon [dash] doe [at] example [dot] com');
+    }
+
+
+}
+//Setup VIM: ex: et ts=4 :