Merge branch 'develop' into pr/utf8mb4

Conflicts:
	tests/Install/AutoinstallCept.php
This commit is contained in:
Kijin Sung 2016-01-11 20:03:55 +09:00
commit e572b81b8a
42 changed files with 77 additions and 6133 deletions

View file

@ -28,7 +28,7 @@ $install_config = array(
'db_userid' => $dbinfo['user'],
'db_password' => $dbinfo['password'],
'db_database' => $dbinfo['dbname'],
'db_table_prefix' =>'xe_',
'db_table_prefix' =>'rx',
'db_charset' => 'utf8',
'use_rewrite' =>'N',
'time_zone' =>'0900',

View file

@ -14,7 +14,7 @@ $dbinfo = [
'type' => $db_type,
'user' => $db_config['user'],
'password' => $db_config['password'],
'dbname' => 'xe_install',
'dbname' => 'rhymix',
'port' => ((isset($db_config['port']) && $db_config['port'])?: 3306),
];
foreach($dsn as $piece) {
@ -27,7 +27,7 @@ if(\Filehandler::exists(_XE_PATH_ . 'config/install.config.php')) {
}
// Step 1 : License Agreement
$I->wantTo('Install XE Core');
$I->wantTo('Install RhymiX');
$I->amOnPage('/index.php?l=ko');
$I->setCookie('l', 'ko');
$I->seeElement('//div[@id="progress"]/ul/li[1][@class="active"]');
@ -50,7 +50,7 @@ $I->submitForm('#body', [
'db_userid' => $dbinfo['user'],
'db_password' => $dbinfo['password'],
'db_database' => $dbinfo['dbname'],
'db_table_prefix' => 'xe'
'db_table_prefix' => 'rx'
]);
// Step 4 : Create Admin Account

File diff suppressed because it is too large Load diff