mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-27 20:51:57 +00:00
Fixed export testing and updated travis settings
This commit is contained in:
parent
a90f564980
commit
e3eefba745
15
.travis.yml
15
.travis.yml
@ -1,5 +1,5 @@
|
|||||||
dist: trusty
|
dist: trusty
|
||||||
sudo: required
|
sudo: false
|
||||||
language: php
|
language: php
|
||||||
php:
|
php:
|
||||||
- 7.0
|
- 7.0
|
||||||
@ -8,15 +8,11 @@ cache:
|
|||||||
directories:
|
directories:
|
||||||
- $HOME/.composer/cache
|
- $HOME/.composer/cache
|
||||||
|
|
||||||
addons:
|
|
||||||
apt:
|
|
||||||
packages:
|
|
||||||
- mysql-server-5.6
|
|
||||||
- mysql-client-core-5.6
|
|
||||||
- mysql-client-5.6
|
|
||||||
|
|
||||||
before_script:
|
before_script:
|
||||||
- mysql -u root -e 'create database `bookstack-test`;'
|
- 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
|
- phpenv config-rm xdebug.ini
|
||||||
- composer dump-autoload --no-interaction
|
- composer dump-autoload --no-interaction
|
||||||
- composer install --prefer-dist --no-interaction
|
- composer install --prefer-dist --no-interaction
|
||||||
@ -25,5 +21,8 @@ before_script:
|
|||||||
- php artisan migrate --force -n --database=mysql_testing
|
- php artisan migrate --force -n --database=mysql_testing
|
||||||
- php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
|
- php artisan db:seed --force -n --class=DummyContentSeeder --database=mysql_testing
|
||||||
|
|
||||||
|
after_failure:
|
||||||
|
- cat storage/logs/laravel.log
|
||||||
|
|
||||||
script:
|
script:
|
||||||
- phpunit
|
- phpunit
|
@ -82,7 +82,7 @@ return [
|
|||||||
|
|
||||||
'mysql_testing' => [
|
'mysql_testing' => [
|
||||||
'driver' => 'mysql',
|
'driver' => 'mysql',
|
||||||
'host' => 'localhost',
|
'host' => '127.0.0.1',
|
||||||
'database' => 'bookstack-test',
|
'database' => 'bookstack-test',
|
||||||
'username' => env('MYSQL_USER', 'bookstack-test'),
|
'username' => env('MYSQL_USER', 'bookstack-test'),
|
||||||
'password' => env('MYSQL_PASSWORD', 'bookstack-test'),
|
'password' => env('MYSQL_PASSWORD', 'bookstack-test'),
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
<title>{{ $book->name }}</title>
|
<title>{{ $book->name }}</title>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
@if (!app()->environment('testing'))
|
||||||
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
|
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
|
||||||
|
@endif
|
||||||
.page-break {
|
.page-break {
|
||||||
page-break-after: always;
|
page-break-after: always;
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
<title>{{ $chapter->name }}</title>
|
<title>{{ $chapter->name }}</title>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
@if (!app()->environment('testing'))
|
||||||
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
|
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
|
||||||
|
@endif
|
||||||
.page-break {
|
.page-break {
|
||||||
page-break-after: always;
|
page-break-after: always;
|
||||||
}
|
}
|
||||||
|
@ -5,7 +5,9 @@
|
|||||||
<title>{{ $page->name }}</title>
|
<title>{{ $page->name }}</title>
|
||||||
|
|
||||||
<style>
|
<style>
|
||||||
|
@if (!app()->environment('testing'))
|
||||||
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
|
{!! file_get_contents(public_path('/css/export-styles.css')) !!}
|
||||||
|
@endif
|
||||||
</style>
|
</style>
|
||||||
@yield('head')
|
@yield('head')
|
||||||
</head>
|
</head>
|
||||||
|
Loading…
Reference in New Issue
Block a user