Fixed export testing and updated travis settings

diff --git a/.travis.yml b/.travis.yml
index 0ad753ced42e8f2bed7b57a3d74d2d34a448b561..909e3e1f4a6c3f23bb08a4ce8d71b80925487646 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 dist: trusty
 dist: trusty

-sudo: required
+sudo: false

 language: php
 php:
   - 7.0
 language: php
 php:
   - 7.0


@@ -8,15 +8,11 @@ cache:
   directories:
     - $HOME/.composer/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`;'
 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
   - 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
 
   - 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
 script:
   - phpunit
\ No newline at end of file

diff --git a/config/database.php b/config/database.php
index 832852dc2995d094e676ad1a50cd48ce037902ef..92c7682450a68317015e6559380e34cfeaf414db 100644 (file)
--- a/config/database.php
+++ b/config/database.php
@@ -82,7 +82,7 @@ return [
 
         'mysql_testing' => [
             'driver'    => 'mysql',
 
         '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'),
             '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 e5fbada444557fbe34295840e7bde0908a21d983..3ea3c9d65a72b6c2af36d5cd4bc9bf0781f67e12 100644 (file)
--- a/resources/views/books/export.blade.php
+++ b/resources/views/books/export.blade.php
@@ -5,7 +5,9 @@
     <title>{{ $book->name }}</title>
 
     <style>
     <title>{{ $book->name }}</title>
 
     <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-after: always;
         }
         .page-break {
             page-break-after: always;
         }

diff --git a/resources/views/chapters/export.blade.php b/resources/views/chapters/export.blade.php
index 57fcd16491c6c700c2e3047b73605af65226f66e..0fc1295df64b67cc8abd45c677302817e0f07cf0 100644 (file)
--- a/resources/views/chapters/export.blade.php
+++ b/resources/views/chapters/export.blade.php
@@ -5,7 +5,9 @@
     <title>{{ $chapter->name }}</title>
 
     <style>
     <title>{{ $chapter->name }}</title>
 
     <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-after: always;
         }
         .page-break {
             page-break-after: always;
         }

diff --git a/resources/views/pages/export.blade.php b/resources/views/pages/export.blade.php
index e0813e46849429cee36a032b161be03a0d7362d9..0bb376a9ae7ae932c7e94b3853a4b152e890c46d 100644 (file)
--- a/resources/views/pages/export.blade.php
+++ b/resources/views/pages/export.blade.php
@@ -5,7 +5,9 @@
     <title>{{ $page->name }}</title>
 
     <style>
     <title>{{ $page->name }}</title>
 
     <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>
     @yield('head')
 </head>
     </style>
     @yield('head')
 </head>