Infra-Mirrors/BookStack
1
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2024-08-24 19:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updated travis testing to work with new helper configuration (#175)

Browse Source 
* Updated travis to call phpunit globally rather then booting application first
This commit is contained in:
Dan Brown 2016-08-27 11:27:23 +01:00 committed by GitHub
parent 7973412c29
commit 3f81eba13b
2 changed files with 26 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
View File

@ -6,7 +6,6 @@ php:
cache: cache:
directories: directories:
- vendor
- node_modules - node_modules
- $HOME/.composer/cache - $HOME/.composer/cache
@ -29,8 +28,10 @@ before_script:
- composer install --prefer-dist --no-interaction - composer install --prefer-dist --no-interaction
- npm install - npm install
- ./node_modules/.bin/gulp - ./node_modules/.bin/gulp
- php artisan clear-compiled -n
- php artisan optimize -n
- 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
script: script:
- vendor/bin/phpunit - phpunit

2
app/helpers.php
View File

@ -2,7 +2,6 @@
use BookStack\Ownable; use BookStack\Ownable;
if (!function_exists('versioned_asset')) {
/** /**
* Get the path to a versioned file. * Get the path to a versioned file.
* *
@ -29,7 +28,6 @@ if (!function_exists('versioned_asset')) {
throw new InvalidArgumentException("File {$file} not defined in asset manifest."); throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
} }
}
/** /**
* Check if the current user has a permission. * Check if the current user has a permission.