Fixing tests for AutomaticInstallation
This commit is contained in:
parent
fe6e600dc5
commit
924b21623c
|
@ -205,6 +205,7 @@ CONF;
|
||||||
$this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=admin@friendica.local'));
|
$this->assertTrue(putenv('FRIENDICA_ADMIN_MAIL=admin@friendica.local'));
|
||||||
$this->assertTrue(putenv('FRIENDICA_TZ=Europe/Berlin'));
|
$this->assertTrue(putenv('FRIENDICA_TZ=Europe/Berlin'));
|
||||||
$this->assertTrue(putenv('FRIENDICA_LANG=de'));
|
$this->assertTrue(putenv('FRIENDICA_LANG=de'));
|
||||||
|
$this->assertTrue(putenv('FRIENDICA_URL_PATH=/friendica'));
|
||||||
|
|
||||||
$txt = $this->execute(['autoinstall']);
|
$txt = $this->execute(['autoinstall']);
|
||||||
|
|
||||||
|
@ -218,6 +219,7 @@ CONF;
|
||||||
$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
|
$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
|
||||||
$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
|
$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
|
||||||
$this->assertConfig('system', 'language', 'de');
|
$this->assertConfig('system', 'language', 'de');
|
||||||
|
$this->assertConfig('system', 'url_path', '/friendica');
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -248,6 +250,9 @@ CONF;
|
||||||
array_push($args, '--lang');
|
array_push($args, '--lang');
|
||||||
array_push($args, 'de');
|
array_push($args, 'de');
|
||||||
|
|
||||||
|
array_push($args, '--urlpath');
|
||||||
|
array_push($args, '/friendica');
|
||||||
|
|
||||||
$txt = $this->execute($args);
|
$txt = $this->execute($args);
|
||||||
|
|
||||||
$this->assertFinished($txt, true);
|
$this->assertFinished($txt, true);
|
||||||
|
@ -260,6 +265,7 @@ CONF;
|
||||||
$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
|
$this->assertConfig('config', 'admin_email', 'admin@friendica.local');
|
||||||
$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
|
$this->assertConfig('system', 'default_timezone', 'Europe/Berlin');
|
||||||
$this->assertConfig('system', 'language', 'de');
|
$this->assertConfig('system', 'language', 'de');
|
||||||
|
$this->assertConfig('system', 'url_path', '/friendica');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function testNoDatabaseConnection()
|
public function testNoDatabaseConnection()
|
||||||
|
@ -288,20 +294,21 @@ Notes
|
||||||
Not checking .htaccess/URL-Rewrite during CLI installation.
|
Not checking .htaccess/URL-Rewrite during CLI installation.
|
||||||
|
|
||||||
Options
|
Options
|
||||||
-h|--help|-? Show help information
|
-h|--help|-? Show help information
|
||||||
-v Show more debug information.
|
-v Show more debug information.
|
||||||
-a All setup checks are required (except .htaccess)
|
-a All setup checks are required (except .htaccess)
|
||||||
-f|--file <config> prepared config file (e.g. "config/local.ini.php" itself) which will override every other config option - except the environment variables)
|
-f|--file <config> prepared config file (e.g. "config/local.ini.php" itself) which will override every other config option - except the environment variables)
|
||||||
-s|--savedb Save the DB credentials to the file (if environment variables is used)
|
-s|--savedb Save the DB credentials to the file (if environment variables is used)
|
||||||
-H|--dbhost <host> The host of the mysql/mariadb database (env MYSQL_HOST)
|
-H|--dbhost <host> The host of the mysql/mariadb database (env MYSQL_HOST)
|
||||||
-p|--dbport <port> The port of the mysql/mariadb database (env MYSQL_PORT)
|
-p|--dbport <port> The port of the mysql/mariadb database (env MYSQL_PORT)
|
||||||
-d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
|
-d|--dbdata <database> The name of the mysql/mariadb database (env MYSQL_DATABASE)
|
||||||
-U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
|
-U|--dbuser <username> The username of the mysql/mariadb database login (env MYSQL_USER or MYSQL_USERNAME)
|
||||||
-P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
|
-P|--dbpass <password> The password of the mysql/mariadb database login (env MYSQL_PASSWORD)
|
||||||
-b|--phppath <path> The path of the PHP binary (env FRIENDICA_PHP_PATH)
|
-b|--urlpath <url_path> The URL path of Friendica - f.e. '/friendica' (env FRIENDICA_URL_PATH)
|
||||||
-A|--admin <mail> The admin email address of Friendica (env FRIENDICA_ADMIN_MAIL)
|
-b|--phppath <php_path> The path of the PHP binary (env FRIENDICA_PHP_PATH)
|
||||||
-T|--tz <timezone> The timezone of Friendica (env FRIENDICA_TZ)
|
-A|--admin <mail> The admin email address of Friendica (env FRIENDICA_ADMIN_MAIL)
|
||||||
-L|--lang <language> The language of Friendica (env FRIENDICA_LANG)
|
-T|--tz <timezone> The timezone of Friendica (env FRIENDICA_TZ)
|
||||||
|
-L|--lang <language> The language of Friendica (env FRIENDICA_LANG)
|
||||||
|
|
||||||
Environment variables
|
Environment variables
|
||||||
MYSQL_HOST The host of the mysql/mariadb database (mandatory if mysql and environment is used)
|
MYSQL_HOST The host of the mysql/mariadb database (mandatory if mysql and environment is used)
|
||||||
|
@ -309,6 +316,7 @@ Environment variables
|
||||||
MYSQL_USERNAME|MYSQL_USER The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
|
MYSQL_USERNAME|MYSQL_USER The username of the mysql/mariadb database login (MYSQL_USERNAME is for mysql, MYSQL_USER for mariadb)
|
||||||
MYSQL_PASSWORD The password of the mysql/mariadb database login
|
MYSQL_PASSWORD The password of the mysql/mariadb database login
|
||||||
MYSQL_DATABASE The name of the mysql/mariadb database
|
MYSQL_DATABASE The name of the mysql/mariadb database
|
||||||
|
FRIENDICA_URL_PATH The URL path of Friendica (f.e. '/friendica')
|
||||||
FRIENDICA_PHP_PATH The path of the PHP binary
|
FRIENDICA_PHP_PATH The path of the PHP binary
|
||||||
FRIENDICA_ADMIN_MAIL The admin email address of Friendica (this email will be used for admin access)
|
FRIENDICA_ADMIN_MAIL The admin email address of Friendica (this email will be used for admin access)
|
||||||
FRIENDICA_TZ The timezone of Friendica
|
FRIENDICA_TZ The timezone of Friendica
|
||||||
|
|
Loading…
Reference in a new issue