diff options
| author | Anika Henke <anika@selfthinker.org> | 2015-07-25 23:13:18 +0100 |
|---|---|---|
| committer | Anika Henke <anika@selfthinker.org> | 2015-07-25 23:13:18 +0100 |
| commit | 0bfc8d5a03c495c3436780901fe59341faee4d9e (patch) | |
| tree | 5fe7a6e2e087880647a748b1fbd53ca66aafd943 /_test/tests/inc/remote.test.php | |
| parent | cf2c8e759bf06596f9492d090f4dd8dbb76a178c (diff) | |
| parent | 6cb9974651aef2a41b48fcb922cc6baa18a0660f (diff) | |
| download | rpg-0bfc8d5a03c495c3436780901fe59341faee4d9e.tar.gz rpg-0bfc8d5a03c495c3436780901fe59341faee4d9e.tar.bz2 | |
Merge remote-tracking branch 'origin/master' into styler
Conflicts:
lib/exe/css.php
Diffstat (limited to '_test/tests/inc/remote.test.php')
| -rw-r--r-- | _test/tests/inc/remote.test.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/_test/tests/inc/remote.test.php b/_test/tests/inc/remote.test.php index d0d4eb7ce..037b1dc0b 100644 --- a/_test/tests/inc/remote.test.php +++ b/_test/tests/inc/remote.test.php @@ -160,10 +160,16 @@ class remote_test extends DokuWikiTest { $this->assertTrue($this->remote->hasAccess()); } + /** + * @expectedException RemoteAccessDeniedException + */ function test_hasAccessFail() { global $conf; $conf['remote'] = 0; - $this->assertFalse($this->remote->hasAccess()); + // the hasAccess() should throw a Exception to keep the same semantics with xmlrpc.php. + // because the user(xmlrpc) check remote before .--> (!$conf['remote']) die('XML-RPC server not enabled.'); + // so it must be a Exception when get here. + $this->remote->hasAccess(); } function test_hasAccessFailAcl() { |