holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use EGW_(USER|PASSWORD) from doc/phpunix.xml instead of hardcoded demo/guest

Browse Source
This commit is contained in:
Ralf Becker 2021-09-20 18:52:25 +02:00
parent 1e1b5ce935
commit 13198e12c9
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/tests/CalDAVTest.php
View File

@ -67,15 +67,15 @@ abstract class CalDAVTest extends TestCase
/**
* Get HTTP client for tests
*
* It will use by default the always existing user "demo" with password "guest" (use [] to NOT authenticate).
* It will use by default the user configured in phpunit.xml: demo/guest (use [] to NOT authenticate).
* Additional users need to be created with $this->createUser("name").
*
* @param string|array $user_or_options ='demo' string with account_lid of user for authentication or array of options
* @param string|array $user_or_options =null string with account_lid of user for authentication or array of options
* @return Client
* @see http://docs.guzzlephp.org/en/v6/request-options.html
* @see http://docs.guzzlephp.org/en/v6/quickstart.html
*/
protected function getClient($user_or_options='demo')
protected function getClient($user_or_options=null)
{
if (!is_array($user_or_options))
{
@ -160,14 +160,15 @@ abstract class CalDAVTest extends TestCase
/**
* Get authentication information for given user to use
*
* @param string $_account_lid ='demo'
* @param string $_account_lid =null default EGW_USER configured in phpunit.xml
* @return array
*/
protected function auth($_account_lid='demo')
protected function auth($_account_lid=null)
{
if ($_account_lid === 'demo')
if (!isset($_account_lid) || $_account_lid === $GLOBALS['EGW_USER'])
{
$password = 'guest';
$_account_lid = $GLOBALS['EGW_USER'];
$password = $GLOBALS['EGW_PASSWORD'];
}
elseif (!isset(self::$created_users[$_account_lid]))
{