mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-24 19:25:27 +00:00
Updated travis testing to work with new helper configuration (#175)
* Updated travis to call phpunit globally rather then booting application first
This commit is contained in:
parent
7973412c29
commit
3f81eba13b
@ -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,33 +2,31 @@
|
|||||||
|
|
||||||
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.
|
*
|
||||||
*
|
* @param string $file
|
||||||
* @param string $file
|
* @return string
|
||||||
* @return string
|
*
|
||||||
*
|
* @throws \InvalidArgumentException
|
||||||
* @throws \InvalidArgumentException
|
*/
|
||||||
*/
|
function versioned_asset($file)
|
||||||
function versioned_asset($file)
|
{
|
||||||
{
|
static $manifest = null;
|
||||||
static $manifest = null;
|
|
||||||
|
|
||||||
if (is_null($manifest)) {
|
if (is_null($manifest)) {
|
||||||
$manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
|
$manifest = json_decode(file_get_contents(public_path('build/manifest.json')), true);
|
||||||
}
|
|
||||||
|
|
||||||
if (isset($manifest[$file])) {
|
|
||||||
return baseUrl($manifest[$file]);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (file_exists(public_path($file))) {
|
|
||||||
return baseUrl($file);
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (isset($manifest[$file])) {
|
||||||
|
return baseUrl($manifest[$file]);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (file_exists(public_path($file))) {
|
||||||
|
return baseUrl($file);
|
||||||
|
}
|
||||||
|
|
||||||
|
throw new InvalidArgumentException("File {$file} not defined in asset manifest.");
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user