DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Applying @dmeltzer’s changes from afc8ac5e72

Browse source
This commit is contained in:
snipe 2018-07-24 20:21:19 -07:00
parent 7bb50a61a7
commit f69e34f6ca
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
config/app.php
View file

@ -291,7 +291,7 @@ return [
Collective\Html\HtmlServiceProvider::class, Collective\Html\HtmlServiceProvider::class,
Spatie\Backup\BackupServiceProvider::class, Spatie\Backup\BackupServiceProvider::class,
Fideloper\Proxy\TrustedProxyServiceProvider::class, Fideloper\Proxy\TrustedProxyServiceProvider::class,
PragmaRX\Google2FA\Vendor\Laravel\ServiceProvider::class, PragmaRX\Google2FALaravel\ServiceProvider::class,
Laravel\Passport\PassportServiceProvider::class, Laravel\Passport\PassportServiceProvider::class,
Laravel\Tinker\TinkerServiceProvider::class, Laravel\Tinker\TinkerServiceProvider::class,
Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class, Unicodeveloper\DumbPassword\DumbPasswordServiceProvider::class,
@ -365,7 +365,7 @@ return [
'Input' => Illuminate\Support\Facades\Input::class, 'Input' => Illuminate\Support\Facades\Input::class,
'Form' => Collective\Html\FormFacade::class, 'Form' => Collective\Html\FormFacade::class,
'Html' => Collective\Html\HtmlFacade::class, 'Html' => Collective\Html\HtmlFacade::class,
'Google2FA' => PragmaRX\Google2FA\Vendor\Laravel\Facade::class, 'Google2FA' => PragmaRX\Google2FALaravel\Facade::class,
'Debugbar' => Barryvdh\Debugbar\Facade::class, 'Debugbar' => Barryvdh\Debugbar\Facade::class,
'Image' => Intervention\Image\ImageManagerStatic::class, 'Image' => Intervention\Image\ImageManagerStatic::class,
'Carbon' => Carbon\Carbon::class, 'Carbon' => Carbon\Carbon::class,

4
tests/api/ApiCategoriesCest.php
View file

@ -25,14 +25,14 @@ class ApiCategoriesCest
$I->wantTo('Get a list of categories'); $I->wantTo('Get a list of categories');
// call // call
$I->sendGET('/categories?order_by=id&limit=10'); $I->sendGET('/categories?sort=id&limit=10');
$I->seeResponseIsJson(); $I->seeResponseIsJson();
$I->seeResponseCodeIs(200); $I->seeResponseCodeIs(200);
$response = json_decode($I->grabResponse(), true); $response = json_decode($I->grabResponse(), true);
// sample verify // sample verify
$category = App\Models\Category::withCount('assets','accessories','consumables','components','licenses') $category = App\Models\Category::withCount('assets','accessories','consumables','components','licenses')
->orderByDesc('created_at')->take(10)->get()->shuffle()->first(); ->orderByDesc('id')->take(10)->get()->shuffle()->first();
$I->seeResponseContainsJson($I->removeTimestamps((new CategoriesTransformer)->transformCategory($category))); $I->seeResponseContainsJson($I->removeTimestamps((new CategoriesTransformer)->transformCategory($category)));
} }