Fix unit tests for PHP 7.2

This commit is contained in:
Kijin Sung 2018-06-14 15:37:04 +09:00
parent b6557622d2
commit 89fcea58c9
4 changed files with 11 additions and 11 deletions

View file

@ -7,9 +7,10 @@ php:
- 7.0 - 7.0
- 7.1 - 7.1
- 7.2 - 7.2
- nightly
matrix: matrix:
allow_failures: allow_failures:
- php: 7.2 - php: nightly
services: services:
- mysql - mysql
before_script: before_script:
@ -17,10 +18,9 @@ before_script:
- mysql -u root -e "CREATE DATABASE rhymix CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci" - mysql -u root -e "CREATE DATABASE rhymix CHARSET utf8mb4 COLLATE utf8mb4_unicode_ci"
- mysql -u root -e "GRANT ALL PRIVILEGES ON rhymix.* TO travis@localhost" - mysql -u root -e "GRANT ALL PRIVILEGES ON rhymix.* TO travis@localhost"
- mysql -u root -e "UPDATE mysql.user SET Password = PASSWORD('travis') WHERE User = 'travis'; FLUSH PRIVILEGES" - mysql -u root -e "UPDATE mysql.user SET Password = PASSWORD('travis') WHERE User = 'travis'; FLUSH PRIVILEGES"
- phpenv config-rm xdebug.ini - if [[ $TRAVIS_PHP_VERSION != "nightly" ]]; then phpenv config-rm xdebug.ini; fi
- if [[ $TRAVIS_PHP_VERSION =~ ^5 ]]; then wget https://codeception.com/releases/2.1.11/codecept.phar; else wget https://codeception.com/releases/2.3.9/codecept.phar; fi
- php -S localhost:8000 & - php -S localhost:8000 &
- if [[ $TRAVIS_PHP_VERSION != "7.2" ]]; then wget https://codeception.com/releases/2.1.11/codecept.phar; fi
- if [[ $TRAVIS_PHP_VERSION == "7.2" ]]; then wget https://codeception.com/releases/2.3.9/codecept.phar; fi
script: script:
- php codecept.phar build - php codecept.phar build
- php codecept.phar run --debug --fail-fast --env travis - php codecept.phar run --debug --fail-fast --env travis

View file

@ -6,12 +6,12 @@ modules:
url: 'http://localhost:8000/' url: 'http://localhost:8000/'
DbDropTablesHelper: DbDropTablesHelper:
dsn: 'mysql:host=localhost;dbname=rhymix' dsn: 'mysql:host=localhost;dbname=rhymix'
user: 'root' user: 'travis'
password: 'root' password: 'travis'
Db: Db:
dsn: 'mysql:host=localhost;dbname=rhymix' dsn: 'mysql:host=localhost;dbname=rhymix'
user: 'root' user: 'travis'
password: 'root' password: 'travis'
cleanup: true cleanup: true
env: env:
travis: travis:

View file

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

View file

@ -47,13 +47,13 @@ $I->seeInCurrentUrl('act=dispInstallDBConfig');
$I->seeElement('select[name="db_type"]'); $I->seeElement('select[name="db_type"]');
$I->submitForm('#body', [ $I->submitForm('#body', [
'act' => 'procDBConfig', 'act' => 'procDBConfig',
'db_type' => 'mysqli_innodb', 'db_type' => 'mysqli',
'db_host' => $dbinfo['host'], 'db_host' => $dbinfo['host'],
'db_port' => $dbinfo['port'], 'db_port' => $dbinfo['port'],
'db_user' => $dbinfo['user'], 'db_user' => $dbinfo['user'],
'db_pass' => $dbinfo['password'], 'db_pass' => $dbinfo['password'],
'db_database' => $dbinfo['dbname'], 'db_database' => $dbinfo['dbname'],
'db_prefix' => 'rx' 'db_prefix' => 'rx',
]); ]);
// Step 4 : Create Admin Account // Step 4 : Create Admin Account