diff --git a/.travis.yml b/.travis.yml index 0ad753ced..909e3e1f4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ dist: trusty -sudo: required +sudo: false language: php php: - 7.0 @@ -8,15 +8,11 @@ cache: directories: - $HOME/.composer/cache -addons: - apt: - packages: - - mysql-server-5.6 - - mysql-client-core-5.6 - - mysql-client-5.6 - before_script: - mysql -u root -e 'create database `bookstack-test`;' + - mysql -u root -e "CREATE USER 'bookstack-test'@'localhost' IDENTIFIED BY 'bookstack-test';" + - mysql -u root -e "GRANT ALL ON \`bookstack-test\`.* TO 'bookstack-test'@'localhost';" + - mysql -u root -e "FLUSH PRIVILEGES;" - phpenv config-rm xdebug.ini - composer dump-autoload --no-interaction - composer install --prefer-dist --no-interaction @@ -25,5 +21,8 @@ before_script: - php artisan migrate --force -n --database=mysql_testing - php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing +after_failure: + - cat storage/logs/laravel.log + script: - phpunit \ No newline at end of file diff --git a/config/database.php b/config/database.php index 832852dc2..92c768245 100644 --- a/config/database.php +++ b/config/database.php @@ -82,7 +82,7 @@ return [ 'mysql_testing' => [ 'driver' => 'mysql', - 'host' => 'localhost', + 'host' => '127.0.0.1', 'database' => 'bookstack-test', 'username' => env('MYSQL_USER', 'bookstack-test'), 'password' => env('MYSQL_PASSWORD', 'bookstack-test'), diff --git a/resources/views/books/export.blade.php b/resources/views/books/export.blade.php index e5fbada44..3ea3c9d65 100644 --- a/resources/views/books/export.blade.php +++ b/resources/views/books/export.blade.php @@ -5,7 +5,9 @@ {{ $book->name }} @yield('head')