Fixed export testing and updated travis settings

This commit is contained in:
Dan Brown 2017-02-26 21:39:15 +00:00
parent a90f564980
commit e3eefba745
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
5 changed files with 14 additions and 9 deletions

View File

@ -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

View File

@ -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'),

View File

@ -5,7 +5,9 @@
<title>{{ $book->name }}</title>
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
@endif
.page-break {
page-break-after: always;
}

View File

@ -5,7 +5,9 @@
<title>{{ $chapter->name }}</title>
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
@endif
.page-break {
page-break-after: always;
}

View File

@ -5,7 +5,9 @@
<title>{{ $page->name }}</title>
<style>
@if (!app()->environment('testing'))
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
@endif
</style>
@yield('head')
</head>