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

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

1 files changed, 0 insertions, 132 deletions

diff --git a/_test/cases/inc/auth_admincheck.test.php b/_test/cases/inc/auth_admincheck.test.php
deleted file mode 100644
index 2a420ffd4..000000000
--- a/_test/cases/inc/auth_admincheck.test.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-
-require_once DOKU_INC.'inc/init.php';
-require_once DOKU_INC.'inc/auth.php';
-require_once DOKU_INC.'inc/auth/basic.class.php';
-
-class auth_admin_test_AuthInSensitive extends auth_basic {
-    function isCaseSensitive(){
-        return false;
-    }
-}
-
-class auth_admin_test extends UnitTestCase {
-
-    private $oldauth;
-
-    function setup() {
-        global $auth;
-        $this->oldauth = $auth;
-        parent::setup();
-    }
-
-    function setSensitive() {
-        global $auth;
-        $auth = new auth_basic;
-    }
-
-    function setInSensitive() {
-        global $auth;
-        $auth = new auth_admin_test_AuthInSensitive;
-    }
-
-    function teardown() {
-        global $auth;
-        global $conf;
-        global $AUTH_ACL;
-        unset($conf);
-        unset($AUTH_ACL);
-        $auth = $this->oldauth;
-        parent::teardown();
-    }
-
-    function test_ismanager_insensitive(){
-        $this->setInSensitive();
-        global $conf;
-        $conf['superuser'] = 'john,@admin,@Mötly Görls, Dörte';
-        $conf['manager'] = 'john,@managers,doe, @Mötly Böys, Dänny';
-
-        // anonymous user
-        $this->assertEqual(auth_ismanager('jill', null,false), false);
-
-        // admin or manager users
-        $this->assertEqual(auth_ismanager('john', null,false), true);
-        $this->assertEqual(auth_ismanager('doe',  null,false), true);
-
-        $this->assertEqual(auth_ismanager('dörte', null,false), true);
-        $this->assertEqual(auth_ismanager('dänny', null,false), true);
-
-        // admin or manager groups
-        $this->assertEqual(auth_ismanager('jill', array('admin'),false), true);
-        $this->assertEqual(auth_ismanager('jill', array('managers'),false), true);
-
-        $this->assertEqual(auth_ismanager('jill', array('mötly görls'),false), true);
-        $this->assertEqual(auth_ismanager('jill', array('mötly böys'),false), true);
-    }
-
-    function test_isadmin_insensitive(){
-        $this->setInSensitive();
-        global $conf;
-        $conf['superuser'] = 'john,@admin,doe,@roots';
-
-        // anonymous user
-        $this->assertEqual(auth_ismanager('jill', null,true), false);
-
-        // admin user
-        $this->assertEqual(auth_ismanager('john', null,true), true);
-        $this->assertEqual(auth_ismanager('doe',  null,true), true);
-
-        // admin groups
-        $this->assertEqual(auth_ismanager('jill', array('admin'),true), true);
-        $this->assertEqual(auth_ismanager('jill', array('roots'),true), true);
-        $this->assertEqual(auth_ismanager('john', array('admin'),true), true);
-        $this->assertEqual(auth_ismanager('doe',  array('admin'),true), true);
-    }
-
-    function test_ismanager_sensitive(){
-        $this->setSensitive();
-        global $conf;
-        $conf['superuser'] = 'john,@admin,@Mötly Görls, Dörte';
-        $conf['manager'] = 'john,@managers,doe, @Mötly Böys, Dänny';
-
-        // anonymous user
-        $this->assertEqual(auth_ismanager('jill', null,false), false);
-
-        // admin or manager users
-        $this->assertEqual(auth_ismanager('john', null,false), true);
-        $this->assertEqual(auth_ismanager('doe',  null,false), true);
-
-        $this->assertEqual(auth_ismanager('dörte', null,false), false);
-        $this->assertEqual(auth_ismanager('dänny', null,false), false);
-
-        // admin or manager groups
-        $this->assertEqual(auth_ismanager('jill', array('admin'),false), true);
-        $this->assertEqual(auth_ismanager('jill', array('managers'),false), true);
-
-        $this->assertEqual(auth_ismanager('jill', array('mötly görls'),false), false);
-        $this->assertEqual(auth_ismanager('jill', array('mötly böys'),false), false);
-    }
-
-    function test_isadmin_sensitive(){
-        $this->setSensitive();
-        global $conf;
-        $conf['superuser'] = 'john,@admin,doe,@roots';
-
-        // anonymous user
-        $this->assertEqual(auth_ismanager('jill', null,true), false);
-
-        // admin user
-        $this->assertEqual(auth_ismanager('john', null,true), true);
-        $this->assertEqual(auth_ismanager('Doe',  null,true), false);
-
-        // admin groups
-        $this->assertEqual(auth_ismanager('jill', array('admin'),true), true);
-        $this->assertEqual(auth_ismanager('jill', array('roots'),true), true);
-        $this->assertEqual(auth_ismanager('john', array('admin'),true), true);
-        $this->assertEqual(auth_ismanager('doe',  array('admin'),true), true);
-        $this->assertEqual(auth_ismanager('Doe',  array('admin'),true), true);
-    }
-
-}
-
-//Setup VIM: ex: et ts=4 :