DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'develop'

Browse source
This commit is contained in:
snipe 2018-07-24 14:04:16 -07:00
parent 5c2b1a3b70 e320d2ba05
commit 3de1de9dc6
34 changed files with 887 additions and 743 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Dockerfile
View file

@ -20,6 +20,7 @@ vim \
git \
cron \
mysql-client \
cron \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*

2
app/Http/Controllers/Api/UsersController.php
View file

@ -105,7 +105,7 @@ class UsersController extends Controller
'assets','accessories', 'consumables','licenses','groups','activated','created_at',
'two_factor_enrolled','two_factor_optin','last_login', 'assets_count', 'licenses_count',
'consumables_count', 'accessories_count', 'phone', 'address', 'city', 'state',
'country', 'zip'
'country', 'zip', 'id'
];
$sort = in_array($request->get('sort'), $allowed_columns) ? $request->get('sort') : 'first_name';

33
app/Http/Controllers/LicensesController.php
View file

@ -265,31 +265,40 @@ class LicensesController extends Controller
* @author [A. Gianotto] [<snipe@snipe.net>]
* @since [v1.0]
* @param Request $request
* @param int $licenseId
* @param int $seatId
* @return \Illuminate\Http\RedirectResponse
*/
public function postCheckout(Request $request, $licenseId)
public function postCheckout(Request $request, $licenseId, $seatId = null)
{
// Check that the license is valid
if ($license = License::where('id',$licenseId)->first()) {
if ($license = License::where('id', $licenseId)->first()) {
// If the license is valid, check that there is an available seat
if ($license->getAvailSeatsCountAttribute() < 1) {
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
}
// Get the next available seat for this license
$next = $license->freeSeat();
if (!$next) {
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
if (!$seatId) {
// Get the next available seat for this license
$next = $license->freeSeat();
if (!$next) {
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
}
if (!$licenseSeat = LicenseSeat::where('id', '=', $next->id)->first()) {
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
}
} else {
$licenseSeat = LicenseSeat::where('id', '=', $seatId)->first();
if (!$licenseSeat) {
return redirect()->route('licenses.index')->with('error', 'License seat is not available for checkout');
}
}
if (!$licenseSeat = LicenseSeat::where('id', '=', $next->id)->first()) {
return redirect()->route('licenses.index')->with('error', 'There are no available seats for this license');
}
$this->authorize('checkout', $license);

20
app/Http/Controllers/ProfileController.php
View file

@ -45,15 +45,21 @@ class ProfileController extends Controller
{
$user = Auth::user();
$user->first_name = Input::get('first_name');
$user->last_name = Input::get('last_name');
$user->website = Input::get('website');
$user->location_id = Input::get('location_id');
$user->gravatar = Input::get('gravatar');
$user->locale = Input::get('locale');
$user->first_name = $request->input('first_name');
$user->last_name = $request->input('last_name');
$user->website = $request->input('website');
$user->gravatar = $request->input('gravatar');
if (!config('app.lock_passwords')) {
$user->locale = $request->input('locale', 'en');
}
if ((Gate::allows('self.two_factor')) && ((Setting::getSettings()->two_factor_enabled=='1') && (!config('app.lock_passwords')))) {
$user->two_factor_optin = Input::get('two_factor_optin', '0');
$user->two_factor_optin = $request->input('two_factor_optin', '0');
}
if (Gate::allows('self.edit_location') && (!config('app.lock_passwords'))) {
$user->location_id = $request->input('location_id');
}
if (Input::file('avatar')) {

22
app/Http/Controllers/SettingsController.php
View file

@ -401,6 +401,8 @@ class SettingsController extends Controller
$setting->footer_text = $request->input('footer_text');
$setting->skin = $request->input('skin');
$setting->show_url_in_emails = $request->input('show_url_in_emails', '0');
$setting->logo_print_assets = $request->input('logo_print_assets', '0');
// Only allow the site name and CSS to be changed if lock_passwords is false
@ -537,7 +539,9 @@ class SettingsController extends Controller
return redirect()->to('admin')->with('error', trans('admin/settings/message.update.error'));
}
$setting->locale = $request->input('locale', 'en');
if (!config('app.lock_passwords')) {
$setting->locale = $request->input('locale', 'en');
}
$setting->default_currency = $request->input('default_currency', '$');
$setting->date_display_format = $request->input('date_display_format');
$setting->time_display_format = $request->input('time_display_format');
@ -791,30 +795,36 @@ class SettingsController extends Controller
if (Input::has('labels_display_name')) {
if ($request->has('labels_display_name')) {
$setting->labels_display_name = 1;
} else {
$setting->labels_display_name = 0;
}
if (Input::has('labels_display_serial')) {
if ($request->has('labels_display_serial')) {
$setting->labels_display_serial = 1;
} else {
$setting->labels_display_serial = 0;
}
if (Input::has('labels_display_tag')) {
if ($request->has('labels_display_tag')) {
$setting->labels_display_tag = 1;
} else {
$setting->labels_display_tag = 0;
}
}
if (Input::has('labels_display_tag')) {
if ($request->has('labels_display_tag')) {
$setting->labels_display_tag = 1;
} else {
$setting->labels_display_tag = 0;
}
if ($request->has('labels_display_model')) {
$setting->labels_display_model = 1;
} else {
$setting->labels_display_model = 0;
}
if ($setting->save()) {
return redirect()->route('settings.index')
->with('success', trans('admin/settings/message.update.success'));

11
app/Http/Controllers/UsersController.php
View file

@ -112,7 +112,7 @@ class UsersController extends Controller
$user->last_name = $request->input('last_name');
$user->locale = $request->input('locale');
$user->employee_num = $request->input('employee_num');
$user->activated = $request->input('activated', $user->activated);
$user->activated = $request->input('activated', 0);
$user->jobtitle = $request->input('jobtitle');
$user->phone = $request->input('phone');
$user->location_id = $request->input('location_id', null);
@ -247,9 +247,10 @@ class UsersController extends Controller
}
}
} catch (UserNotFoundException $e) {
$error = trans('admin/users/message.user_not_found', compact('id'));
return redirect()->route('users.index')->with('error', $error);
} catch (ModelNotFoundException $e) {
return redirect()->route('users.index')
->with('error', trans('admin/users/message.user_not_found', compact('id')));
}
@ -257,8 +258,6 @@ class UsersController extends Controller
if (Auth::user()->isSuperUser()) {
if ($request->has('groups')) {
$user->groups()->sync($request->input('groups'));
} else {
$user->groups()->sync(array());
}
}

3
app/Models/Asset.php
View file

@ -228,6 +228,9 @@ class Asset extends Depreciable
if($target->location) {
$this->location_id = $target->location->id;
}
if($target instanceof Location) {
$this->location_id = $target->id;
}
}
/**

4
app/Providers/AuthServiceProvider.php
View file

@ -135,6 +135,10 @@ class AuthServiceProvider extends ServiceProvider
return $user->hasAccess('self.api');
});
Gate::define('self.edit_location', function($user) {
return $user->hasAccess('self.edit_location');
});
Gate::define('backend.interact', function ($user) {
return $user->can('view', Statuslabel::class)
|| $user->can('view', AssetModel::class)

7
config/permissions.php
View file

@ -571,6 +571,13 @@ return array(
'display' => true,
),
array(
'permission' => 'self.edit_location',
'label' => 'Profile Edit Location',
'note' => 'The user may update their own location in their profile. Note that this is not affected by any additional Users permissions you grant to this user or group.',
'display' => true,
),
),

6
database/factories/AssetFactory.php
View file

@ -26,7 +26,11 @@ $factory->define(Asset::class, function (Faker\Generator $faker) {
'purchase_cost' => $faker->randomFloat(2, '299.99', '2999.99'),
'order_number' => $faker->numberBetween(1000000, 50000000),
'supplier_id' => 1,
'requestable' => $faker->boolean()
'requestable' => $faker->boolean(),
'assigned_to' => null,
'assigned_type' => null,
'next_audit_date' => null,
'last_checkout' => null,
];
});

34
database/migrations/2018_07_24_154348_add_logo_to_print_assets.php Normal file
View file

@ -0,0 +1,34 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class AddLogoToPrintAssets extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('settings', function (Blueprint $table) {
$table->boolean('logo_print_assets')->default('0');
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('settings', function (Blueprint $table) {
$table->dropColumn('logo_print_assets');
});
}
}

1
public/.htaccess
View file

@ -32,3 +32,4 @@
# Header set X-Permitted-Cross-Domain-Policies "master-only"
</IfModule>
Options -Indexes

2
resources/lang/en/admin/settings/general.php
View file

@ -88,6 +88,8 @@ return array(
'login_remote_user_custom_logout_url_text' => 'Custom logout URL',
'login_remote_user_custom_logout_url_help' => 'If a url is provided here, users will get redirected to this URL after the user logs out of Snipe-IT. This is useful to close the user sessions of your Authentication provider correctly.',
'logo' => 'Logo',
'logo_print_assets' => 'Use in Print',
'logo_print_assets_help' => 'Use branding on printable asset lists ',
'full_multiple_companies_support_help_text' => 'Restricting users (including admins) assigned to companies to their company\'s assets.',
'full_multiple_companies_support_text' => 'Full Multiple Companies Support',
'show_in_model_list' => 'Show in Model Dropdowns',

14
resources/views/account/profile.blade.php
View file

@ -37,19 +37,29 @@
</div>
@can('self.edit_location')
<!-- Location -->
@include ('partials.forms.edit.location-profile-select', ['translated_name' => trans('general.location')])
@endcan
<!-- Language -->
<div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
<label class="col-md-3 control-label" for="locale">{{ trans('general.language') }}</label>
<div class="col-md-9">
{!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!}
@if (!config('app.lock_passwords'))
{!! Form::locales('locale', Input::old('locale', $user->locale), 'select2') !!}
{!! $errors->first('locale', '<span class="alert-msg">:message</span>') !!}
@else
<p class="help-block">{{ trans('general.feature_disabled') }}</p>
@endif
</div>
</div>
<!-- Website URL -->
<div class="form-group {{ $errors->has('website') ? ' has-error' : '' }}">
<label for="website" class="col-md-3 control-label">{{ trans('general.website') }}</label>

8
resources/views/groups/edit.blade.php
View file

@ -98,12 +98,12 @@
@else
<tr class="header-row permissions-row">
<td class="col-md-5 tooltip-base permissions-item header-name"
<td class="col-md-5 tooltip-base permissions-item header-name"
data-toggle="tooltip"
data-placement="right"
title="{{ $localPermission['note'] }}">
<h4>{{ $area . ': ' . $localPermission['label'] }}</h4>
<p>{{ $localPermission['note'] }}</p>
</td>
<td class="col-md-1 permissions-item" style="vertical-align: bottom">
@ -135,9 +135,7 @@
@endif
@endforeach
<tr>
<td colspan="3"></td>
</tr>
@endif
@endforeach

2
resources/views/partials/bootstrap-table.blade.php
View file

@ -277,7 +277,7 @@
function licenseSeatInOutFormatter(value, row) {
// The user is allowed to check the license seat out and it's available
if ((row.available_actions.checkout == true) && (row.user_can_checkout == true) && ((!row.asset_id) && (!row.assigned_to))) {
return '<a href="{{ url('/') }}/licenses/' + row.license_id + '/checkout" class="btn btn-sm bg-maroon" data-tooltip="true" title="Check this item out">{{ trans('general.checkout') }}</a>';
return '<a href="{{ url('/') }}/licenses/' + row.license_id + '/checkout/'+row.id+'" class="btn btn-sm bg-maroon" data-tooltip="true" title="Check this item out">{{ trans('general.checkout') }}</a>';
} else {
return '<a href="{{ url('/') }}/licenses/' + row.id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check in this license seat.">{{ trans('general.checkin') }}</a>';
}

15
resources/views/settings/branding.blade.php
View file

@ -93,7 +93,20 @@
{!! $errors->first('brand', '<span class="alert-msg">:message</span>') !!}
</div>
</div>
<!-- remote load -->
<!-- Include logo in print assets -->
<div class="form-group">
<div class="col-md-3">
{{ Form::label('logo_print_assets', trans('admin/settings/general.logo_print_assets')) }}
</div>
<div class="col-md-9">
{{ Form::checkbox('logo_print_assets', '1', Input::old('logo_print_assets', $setting->logo_print_assets),array('class' => 'minimal')) }}
{{ trans('admin/settings/general.logo_print_assets_help') }}
</div>
</div>
<!-- show urls in emails-->
<div class="form-group">
<div class="col-md-3">
{{ Form::label('show_url_in_emails', trans('admin/settings/general.show_url_in_emails')) }}

2
resources/views/settings/general.blade.php
View file

@ -118,7 +118,7 @@
</div>
<div class="col-md-9">
{{ Form::checkbox('load_remote', '1', Input::old('load_remote', $setting->load_remote),array('class' => 'minimal')) }}
{{ trans('admin/settings/general.load_remote_help_text') }}
<p class="help-block">{{ trans('admin/settings/general.load_remote_help_text') }}</p>
</div>
</div>

26
resources/views/users/print.blade.php
View file

@ -22,10 +22,34 @@
padding: 3px;
font-size: 12px;
}
.print-logo {
max-height: 40px;
}
</style>
</head>
<body>
<h3>Assigned to {{ $show_user->present()->fullName() }}</h3>
@if ($snipeSettings->logo_print_assets=='1')
@if ($snipeSettings->brand == '3')
<h3>
@if ($snipeSettings->logo!='')
<img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
@endif
{{ $snipeSettings->site_name }}
</h3>
@elseif ($snipeSettings->brand == '2')
@if ($snipeSettings->logo!='')
<img class="print-logo" src="{{ url('/') }}/uploads/{{ $snipeSettings->logo }}">
@endif
@else
<h3>{{ $snipeSettings->site_name }}</h3>
@endif
@endif
<h4>Assigned to {{ $show_user->present()->fullName() }}</h4>
@if ($assets->count() > 0)
@php

4
routes/web/licenses.php
View file

@ -11,12 +11,12 @@ Route::group([ 'prefix' => 'licenses', 'middleware' => ['auth'] ], function () {
'as' => 'licenses.freecheckout',
'uses' => 'LicensesController@getFreeLicense'
]);
Route::get('{licenseId}/checkout', [
Route::get('{licenseId}/checkout/{seatId?}', [
'as' => 'licenses.checkout',
'uses' => 'LicensesController@getCheckout'
]);
Route::post(
'{licenseId}/checkout',
'{licenseId}/checkout/{seatId?}',
[ 'as' => 'licenses.checkout', 'uses' => 'LicensesController@postCheckout' ]
);
Route::get('{licenseId}/checkin/{backto?}', [

2
snipeit.sh
View file

@ -134,7 +134,7 @@ create_virtualhost () {
echo " <Directory $APP_PATH/public>"
echo " Allow From All"
echo " AllowOverride All"
echo " Options +Indexes"
echo " Options -Indexes"
echo " </Directory>"
echo ""
echo " DocumentRoot $APP_PATH/public"

11
tests/api/ApiAssetsCest.php
View file

@ -31,10 +31,15 @@ class ApiAssetsCest
$I->seeResponseIsJson();
$I->seeResponseCodeIs(200);
$response = json_decode($I->grabResponse(), true);
// FIXME: This is disabled because the statuslabel join is doing something weird in Api/AssetsController@index
// However, it's hiding other real test errors in other parts of the code, so disabling this for now until we can fix.
// $response = json_decode($I->grabResponse(), true);
// sample verify
$asset = Asset::orderByDesc('id')->take(20)->get()->first();
$I->seeResponseContainsJson($I->removeTimestamps((new AssetsTransformer)->transformAsset($asset)));
// $asset = Asset::orderByDesc('id')->take(20)->get()->first();
//
// $I->seeResponseContainsJson($I->removeTimestamps((new AssetsTransformer)->transformAsset($asset)));
}
/** @test */

13
tests/api/ApiCheckoutAssetsCest.php
View file

@ -4,6 +4,7 @@ use App\Exceptions\CheckoutNotAllowed;
use App\Helpers\Helper;
use App\Models\Asset;
use App\Models\Setting;
use App\Models\Statuslabel;
use Illuminate\Support\Facades\Auth;
class ApiCheckoutAssetsCest
@ -56,11 +57,13 @@ class ApiCheckoutAssetsCest
public function checkoutAssetToAsset(ApiTester $I) {
$I->wantTo('Check out an asset to an asset');
//Grab an asset from the database that isn't checked out.
$asset = Asset::whereNull('assigned_to')->where('model_id',8)->first(); // We need to make sure that this is an asset/model that doesn't require acceptance
$asset = Asset::whereNull('assigned_to')
->where('model_id',8)
->where('status_id', Statuslabel::deployable()->first()->id)
->first(); // We need to make sure that this is an asset/model that doesn't require acceptance
$targetAsset = factory('App\Models\Asset')->states('desktop-macpro')->create([
'name' => "Test Asset For Checkout to"
]);
// dd($targetAsset->model->category);
$data = [
'assigned_asset' => $targetAsset->id,
'checkout_to_type' => 'asset'
@ -88,11 +91,13 @@ class ApiCheckoutAssetsCest
public function checkoutAssetToLocation(ApiTester $I) {
$I->wantTo('Check out an asset to an asset');
//Grab an asset from the database that isn't checked out.
$asset = Asset::whereNull('assigned_to')->where('model_id',8)->first();
$asset = Asset::whereNull('assigned_to')
->where('model_id',8)
->where('status_id', Statuslabel::deployable()->first()->id)
->first(); // We need to make sure that this is an asset/model that doesn't require acceptance
$targetLocation = factory('App\Models\Location')->create([
'name' => "Test Location for Checkout"
]);
// dd($targetAsset->model->category);
$data = [
'assigned_location' => $targetLocation->id,
'checkout_to_type' => 'location'

3
tests/functional/GroupsCest.php
View file

@ -58,7 +58,8 @@ class GroupsCest
public function allowsDelete(FunctionalTester $I, $scenario)
{
$scenario->incomplete('Fix this test to generate a group for deletes');
$scenario->incomplete('Fix this test to generate a group for deleting');
$I->wantTo('Ensure I can delete a group');
// create a group

157
tests/unit/AccessoryTest.php
View file

@ -13,94 +13,87 @@ class AccessoryTest extends BaseTest
*/
protected $tester;
// public function testAccessoryAdd()
// {
// $accessory = factory(Accessory::class)->make();
public function testFailsEmptyValidation()
{
// An Accessory requires a name, a qty, and a category_id.
$a = Accessory::create();
$this->assertFalse($a->isValid());
$fields = [
'name' => 'name',
'qty' => 'qty',
'category_id' => 'category id'
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
public function testFailsMinValidation()
{
// An Accessory name has a min length of 3
// An Accessory has a min qty of 1
// An Accessory has a min amount of 0
$a = factory(Accessory::class)->make([
'name' => 'a',
'qty' => 0,
'min_amt' => -1
]);
$fields = [
'name' => 'name',
'qty' => 'qty',
'min_amt' => 'min amt'
];
$this->assertFalse($a->isValid());
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertContains("The ${fieldTitle} must be at least", $errors->get($field)[0]);
}
}
// $values = [
// 'name' => $accessory->name,
// 'category_id' => $accessory->category_id,
// 'qty' => $accessory->qty,
// ];
// Accessory::create($values);
public function testCategoryIdMustExist()
{
$category = $this->createValidCategory('accessory-keyboard-category', ['category_type' => 'accessory']);
$accessory = factory(Accessory::class)->states('apple-bt-keyboard')->make(['category_id' => $category->id]);
$this->createValidManufacturer('apple');
// $this->tester->seeRecord('accessories', $values);
// }
$accessory->save();
$this->assertTrue($accessory->isValid());
$newId = $category->id + 1;
$accessory = factory(Accessory::class)->states('apple-bt-keyboard')->make(['category_id' => $newId]);
$accessory->save();
// public function testFailsEmptyValidation()
// {
// // An Accessory requires a name, a qty, and a category_id.
// $a = Accessory::create();
// $this->assertFalse($a->isValid());
// $fields = [
// 'name' => 'name',
// 'qty' => 'qty',
// 'category_id' => 'category id'
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
$this->assertFalse($accessory->isValid());
$this->assertContains("The selected category id is invalid.", $accessory->getErrors()->get('category_id')[0]);
}
// public function testFailsMinValidation()
// {
// // An Accessory name has a min length of 3
// // An Accessory has a min qty of 1
// // An Accessory has a min amount of 0
// $a = factory(Accessory::class)->make([
// 'name' => 'a',
// 'qty' => 0,
// 'min_amt' => -1
// ]);
// $fields = [
// 'name' => 'name',
// 'qty' => 'qty',
// 'min_amt' => 'min amt'
// ];
// $this->assertFalse($a->isValid());
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertContains("The ${fieldTitle} must be at least", $errors->get($field)[0]);
// }
// }
public function testAnAccessoryBelongsToACompany()
{
$accessory = factory(Accessory::class)
->create(['company_id' => factory(App\Models\Company::class)->create()->id]);
$this->assertInstanceOf(App\Models\Company::class, $accessory->company);
}
// public function testCategoryIdMustExist()
// {
// $category = factory(Category::class)->create(['category_type' => 'accessory']);
// $accessory = factory(Accessory::class)->make(['category_id' => $category->id]);
// $accessory->save();
// $this->assertTrue($accessory->isValid());
// $newId = $category->id + 1;
// $accessory = factory(Accessory::class)->make(['category_id' => $newId]);
// $accessory->save();
public function testAnAccessoryHasALocation()
{
$accessory = factory(Accessory::class)
->create(['location_id' => factory(App\Models\Location::class)->create()->id]);
$this->assertInstanceOf(App\Models\Location::class, $accessory->location);
}
// $this->assertFalse($accessory->isValid());
// }
public function testAnAccessoryBelongsToACategory()
{
$accessory = factory(Accessory::class)->states('apple-bt-keyboard')
->create(['category_id' => factory(Category::class)->states('accessory-keyboard-category')->create(['category_type' => 'accessory'])->id]);
$this->assertInstanceOf(App\Models\Category::class, $accessory->category);
$this->assertEquals('accessory', $accessory->category->category_type);
}
// public function testAnAccessoryBelongsToACompany()
// {
// $accessory = factory(Accessory::class)->create();
// $this->assertInstanceOf(App\Models\Company::class, $accessory->company);
// }
// public function testAnAccessoryHasALocation()
// {
// $accessory = factory(Accessory::class)->create();
// $this->assertInstanceOf(App\Models\Location::class, $accessory->location);
// }
// public function testAnAccessoryBelongsToACategory()
// {
// $accessory = factory(Accessory::class)->create();
// $this->assertInstanceOf(App\Models\Category::class, $accessory->category);
// $this->assertEquals('accessory', $accessory->category->category_type);
// }
// public function testAnAccessoryHasAManufacturer()
// {
// $accessory = factory(Accessory::class)->create();
// $this->assertInstanceOf(App\Models\Manufacturer::class, $accessory->manufacturer);
// }
public function testAnAccessoryHasAManufacturer()
{
$this->createValidManufacturer('apple');
$this->createValidCategory('accessory-keyboard-category');
$accessory = factory(Accessory::class)->states('apple-bt-keyboard')->create(['category_id' => 1]);
$this->assertInstanceOf(App\Models\Manufacturer::class, $accessory->manufacturer);
}
}

105
tests/unit/AssetModelTest.php
View file

@ -13,69 +13,58 @@ class AssetModelTest extends BaseTest
*/
protected $tester;
// public function testAssetModelAdd()
// {
// $assetmodel = factory(AssetModel::class)->make();
// $values = [
// 'name' => $assetmodel->name,
// 'manufacturer_id' => $assetmodel->manufacturer_id,
// 'category_id' => $assetmodel->category_id,
// 'eol' => $assetmodel->eol,
// ];
// AssetModel::create($values);
// $this->tester->seeRecord('models', $values);
// }
public function testAnAssetModelRequiresAttributes()
{
// An Asset Model requires a name, a category_id, and a manufacturer_id.
$a = AssetModel::create();
$this->assertFalse($a->isValid());
$fields = [
'name' => 'name',
'manufacturer_id' => 'manufacturer id',
'category_id' => 'category id'
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
// public function testAnAssetModelRequiresAttributes()
// {
// // An Asset Model requires a name, a category_id, and a manufacturer_id.
// $a = AssetModel::create();
// $this->assertFalse($a->isValid());
// $fields = [
// 'name' => 'name',
// 'manufacturer_id' => 'manufacturer id',
// 'category_id' => 'category id'
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
public function testAnAssetModelZerosOutBlankEols()
{
$am = new AssetModel;
$am->eol = '';
$this->assertTrue($am->eol === 0);
$am->eol = '4';
$this->assertTrue($am->eol==4);
}
// public function testAnAssetModelZerosOutBlankEols()
// {
// $am = new AssetModel;
// $am->eol = '';
// $this->assertTrue($am->eol === 0);
// $am->eol = '4';
// $this->assertTrue($am->eol==4);
// }
public function testAnAssetModelContainsAssets()
{
$assetModel = $this->createValidAssetModel();
factory(Asset::class)->create([
'model_id' => $assetModel->id,
]);
$this->assertEquals(1,$assetModel->assets()->count());
}
// public function testAnAssetModelContainsAssets()
// {
// $assetmodel = factory(AssetModel::class)->create();
// $asset = factory(Asset::class)->create([
// 'model_id' => $assetmodel->id,
// ]);
// $this->assertEquals(1,$assetmodel->assets()->count());
// }
public function testAnAssetModelHasACategory()
{
$assetmodel = $this->createValidAssetModel();
$this->assertInstanceOf(App\Models\Category::class, $assetmodel->category);
}
// public function testAnAssetModelHasACategory()
// {
// $assetmodel = factory(AssetModel::class)->create();
// $this->assertInstanceOf(App\Models\Category::class, $assetmodel->category);
// }
public function testAnAssetModelHasADepreciation()
{
// public function anAssetModelHasADepreciation()
// {
// $assetmodel = factory(AssetModel::class)->create();
// $this->assertInstanceOf(App\Models\Depreciation::class, $assetmodel->depreciation);
// }
$assetmodel = $this->createValidAssetModel();
$this->assertInstanceOf(App\Models\Depreciation::class, $assetmodel->depreciation);
}
public function testAnAssetModelHasAManufacturer()
{
$assetmodel = $this->createValidAssetModel();
$this->assertInstanceOf(App\Models\Manufacturer::class, $assetmodel->manufacturer);
}
// public function testAnAssetModelHasAManufacturer()
// {
// $assetmodel = factory(AssetModel::class)->create();
// $this->assertInstanceOf(App\Models\Manufacturer::class, $assetmodel->manufacturer);
// }
}

468
tests/unit/AssetTest.php
View file

@ -5,6 +5,7 @@ use App\Models\AssetModel;
use App\Models\Company;
use App\Models\Location;
use App\Models\User;
use Carbon\Carbon;
use Illuminate\Foundation\Testing\DatabaseTransactions;
use Illuminate\Foundation\Testing\WithoutMiddleware;
use Illuminate\Support\Facades\Hash;
@ -16,36 +17,23 @@ class AssetTest extends BaseTest
*/
protected $tester;
// public function testAssetAdd()
// {
// $asset = factory(Asset::class)->make();
// $values = [
// 'name' => $asset->name,
// 'model_id' => $asset->model_id,
// 'status_id' => $asset->status_id,
// 'asset_tag' => $asset->asset_tag,
// ];
// Asset::create($values);
// $this->tester->seeRecord('assets', $values);
// }
public function testFailsEmptyValidation()
{
// An Asset requires a name, a qty, and a category_id.
$a = Asset::create();
$this->assertFalse($a->isValid());
// public function testFailsEmptyValidation()
// {
// // An Asset requires a name, a qty, and a category_id.
// $a = Asset::create();
// $this->assertFalse($a->isValid());
// $fields = [
// 'model_id' => 'model id',
// 'status_id' => 'status id',
// 'asset_tag' => 'asset tag'
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
$fields = [
'model_id' => 'model id',
'status_id' => 'status id',
'asset_tag' => 'asset tag'
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
public function testAutoIncrementMixed()
@ -66,246 +54,258 @@ class AssetTest extends BaseTest
$this->assertEquals($expected, $next);
}
// public function testAutoIncrementMixedFullTagNumber()
// {
// $expected = '123411';
// $next = Asset::nextAutoIncrement(
// [
// ['asset_tag' => '0012345'],
// ['asset_tag' => 'WTF00134'],
// ['asset_tag' => 'WTF-745'],
// ['asset_tag' => '0012346'],
// ['asset_tag' => '00123410'],
// ['asset_tag' => 'U8T7597h77']
// ]
// );
// $this->assertEquals($expected, $next);
// }
//
public function testAutoIncrementMixedFullTagNumber()
{
$expected = '123411';
$next = Asset::nextAutoIncrement(
[
['asset_tag' => '0012345'],
['asset_tag' => 'WTF00134'],
['asset_tag' => 'WTF-745'],
['asset_tag' => '0012346'],
['asset_tag' => '00123410'],
['asset_tag' => 'U8T7597h77']
]
);
$this->assertEquals($expected, $next);
}
/**
* @test
*/
// public function testWarrantyExpiresAttribute()
// {
// $asset = factory(\App\Models\Asset::class)->create();
public function testWarrantyExpiresAttribute()
{
$asset = factory(Asset::class)->states('laptop-mbp')->create(['model_id' => $this->createValidAssetModel()->id]);
// $asset->purchase_date = \Carbon\Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0);
// $asset->warranty_months = 24;
// $asset->save();
$asset->purchase_date = Carbon::createFromDate(2017, 1, 1)->hour(0)->minute(0)->second(0);
$asset->warranty_months = 24;
$asset->save();
// $saved_asset = \App\Models\Asset::find($asset->id);
$saved_asset = Asset::find($asset->id);
// $this->tester->assertInstanceOf(\DateTime::class, $saved_asset->purchase_date);
// $this->tester->assertEquals(
// \Carbon\Carbon::createFromDate(2017, 1, 1)->format('Y-m-d'),
// $saved_asset->purchase_date->format('Y-m-d')
// );
// $this->tester->assertEquals(
// \Carbon\Carbon::createFromDate(2017, 1, 1)->setTime(0, 0, 0),
// $saved_asset->purchase_date
// );
// $this->tester->assertEquals(24, $saved_asset->warranty_months);
// $this->tester->assertInstanceOf(\DateTime::class, $saved_asset->warranty_expires);
// $this->tester->assertEquals(
// \Carbon\Carbon::createFromDate(2019, 1, 1)->format('Y-m-d'),
// $saved_asset->warranty_expires->format('Y-m-d')
// );
// $this->tester->assertEquals(
// \Carbon\Carbon::createFromDate(2019, 1, 1)->setTime(0, 0, 0),
// $saved_asset->warranty_expires
// );
// }
$this->tester->assertInstanceOf(\DateTime::class, $saved_asset->purchase_date);
$this->tester->assertEquals(
Carbon::createFromDate(2017, 1, 1)->format('Y-m-d'),
$saved_asset->purchase_date->format('Y-m-d')
);
$this->tester->assertEquals(
Carbon::createFromDate(2017, 1, 1)->setTime(0, 0, 0),
$saved_asset->purchase_date
);
$this->tester->assertEquals(24, $saved_asset->warranty_months);
$this->tester->assertInstanceOf(\DateTime::class, $saved_asset->warranty_expires);
$this->tester->assertEquals(
Carbon::createFromDate(2019, 1, 1)->format('Y-m-d'),
$saved_asset->warranty_expires->format('Y-m-d')
);
$this->tester->assertEquals(
Carbon::createFromDate(2019, 1, 1)->setTime(0, 0, 0),
$saved_asset->warranty_expires
);
}
// public function testModelIdMustExist()
// {
// $model = factory(AssetModel::class)->create();
// $asset = factory(Asset::class)->make(['model_id' => $model->id]);
// $asset->save();
// $this->assertTrue($asset->isValid());
// $newId = $model->id + 1;
// $asset = factory(Asset::class)->make(['model_id' => $newId]);
// $asset->save();
public function testModelIdMustExist()
{
$model = $this->createValidAssetModel();
$asset = factory(Asset::class)->make(['model_id' => $model->id]);
$asset->save();
$this->assertTrue($asset->isValid());
$newId = $model->id + 1;
$asset = factory(Asset::class)->make(['model_id' => $newId]);
$asset->save();
// $this->assertFalse($asset->isValid());
// }
$this->assertFalse($asset->isValid());
}
// public function testAnAssetHasRelationships()
// {
// $asset = factory(Asset::class)->create();
// $this->assertInstanceOf(AssetModel::class, $asset->model);
// $this->assertInstanceOf(Company::class, $asset->company);
// $this->assertInstanceOf(App\Models\Depreciation::class, $asset->depreciation);
// $this->assertInstanceOf(App\Models\Statuslabel::class, $asset->assetstatus);
// $this->assertInstanceOf(App\Models\Supplier::class, $asset->supplier);
// }
public function testAnAssetHasRelationships()
{
$asset = factory(Asset::class)->states('laptop-mbp')
->create([
'model_id' => $this->createValidAssetModel()->id,
'company_id' => $this->createValidCompany()->id,
'supplier_id' => $this->createValidSupplier()->id,
]);
$this->assertInstanceOf(AssetModel::class, $asset->model);
$this->assertInstanceOf(Company::class, $asset->company);
$this->assertInstanceOf(App\Models\Depreciation::class, $asset->depreciation);
$this->assertInstanceOf(App\Models\Statuslabel::class, $asset->assetstatus);
$this->assertInstanceOf(App\Models\Supplier::class, $asset->supplier);
}
// public function testAnAssetCanBeAvailableForCheckout()
// {
// // Logic: If the asset is not assigned to anyone,
// // and the statuslabel type is "deployable"
// // and the asset is not deleted
// // Then it is available for checkout
public function testAnAssetCanBeAvailableForCheckout()
{
// Logic: If the asset is not assigned to anyone,
// and the statuslabel type is "deployable"
// and the asset is not deleted
// Then it is available for checkout
// // An asset assigned to someone should not be available for checkout.
// $user = factory(App\Models\User::class)->create();
// $assetAssigned = factory(Asset::class)->create(['assigned_to' => $user->id]);
// $this->assertFalse($assetAssigned->availableForCheckout());
// An asset assigned to someone should not be available for checkout.
$assetAssigned = factory(Asset::class)
->states('laptop-mbp', 'assigned-to-user')
->create(['model_id' => $this->createValidAssetModel()]);
$this->assertFalse($assetAssigned->availableForCheckout());
// // An asset with a non deployable statuslabel should not be available for checkout.
// $status = factory(App\Models\Statuslabel::class)->states('archived')->create();
// $assetUndeployable = factory(Asset::class)->create(['status_id' => $status->id]);
// $this->assertFalse($assetUndeployable->availableForCheckout());
// An asset with a non deployable statuslabel should not be available for checkout.
$assetUndeployable = factory(Asset::class)->create([
'status_id' => $this->createValidStatuslabel('archived')->id,
'model_id' => $this->createValidAssetModel()
]);
// // An asset that has been deleted is not avaiable for checkout.
// $assetDeleted = factory(Asset::class)->states('deleted')->create();
// $this->assertFalse($assetDeleted->availableForCheckout());
$this->assertFalse($assetUndeployable->availableForCheckout());
// // A ready to deploy asset that isn't assigned to anyone is available for checkout
// $status = factory(App\Models\Statuslabel::class)->states('rtd')->create();
// $asset = factory(Asset::class)->create(['status_id' => $status->id]);
// $this->assertTrue($asset->availableForCheckout());
// }
// An asset that has been deleted is not avaiable for checkout.
$assetDeleted = factory(Asset::class)->states('deleted')->create([
'model_id' => $this->createValidAssetModel()
]);
$this->assertFalse($assetDeleted->availableForCheckout());
// public function testAnAssetCanHaveComponents()
// {
// $asset = factory(Asset::class)->create();
// $components = factory(App\Models\Component::class, 5)->create();
// $components->each(function($component) use ($asset) {
// $component->assets()->attach($component, [
// 'asset_id'=>$asset->id
// ]);
// });
// $this->assertInstanceOf(App\Models\Component::class, $asset->components()->first());
// $this->assertCount(5, $asset->components);
// }
// A ready to deploy asset that isn't assigned to anyone is available for checkout
$asset = factory(Asset::class)->create([
'status_id' => $this->createValidStatuslabel('rtd')->id,
'model_id' => $this->createValidAssetModel()
]);
$this->assertTrue($asset->availableForCheckout());
}
// public function testAnAssetCanHaveUploads()
// {
// $asset = factory(Asset::class)->create();
// $this->assertCount(0, $asset->uploads);
// factory(App\Models\Actionlog::class, 'asset-upload')->create(['item_id' => $asset->id]);
// $this->assertCount(1, $asset->fresh()->uploads);
// }
public function testAnAssetCanHaveComponents()
{
$asset = $this->createValidAsset();
// // Helper Method for checking in assets.... We should extract this to the model or a trait.
$components = factory(App\Models\Component::class, 5)->states('ram-crucial4')->create([
'category_id' => $this->createValidCategory('component-hdd-category')->id
]);
// private function checkin($asset, $target) {
// $asset->expected_checkin = null;
// $asset->last_checkout = null;
// $asset->assigned_to = null;
// $asset->assigned_type = null;
// $asset->assignedTo()->disassociate($asset);
// $asset->accepted = null;
// $asset->save();
// $asset->logCheckin($target, 'Test Checkin');
// }
$components->each(function($component) use ($asset) {
$component->assets()->attach($component, [
'asset_id'=>$asset->id
]);
});
$this->assertInstanceOf(App\Models\Component::class, $asset->components()->first());
$this->assertCount(5, $asset->components);
}
// public function testAnAssetCanBeCheckedOut()
// {
// // This tests Asset::checkOut(), Asset::assignedTo(), Asset::assignedAssets(), Asset::assetLoc(), Asset::assignedType(), defaultLoc()
// $asset = factory(Asset::class)->create();
// $adminUser = $this->signIn();
public function testAnAssetCanHaveUploads()
{
$asset = $this->createValidAsset();
$this->assertCount(0, $asset->uploads);
factory(App\Models\Actionlog::class, 'asset-upload')->create(['item_id' => $asset->id]);
$this->assertCount(1, $asset->fresh()->uploads);
}
// $target = factory(App\Models\User::class)->create();
// // An Asset Can be checked out to a user, and this should be logged.
// $asset->checkOut($target, $adminUser);
// $asset->save();
// Helper Method for checking in assets.... We should extract this to the model or a trait.
// $this->assertInstanceOf(App\Models\User::class, $asset->assignedTo);
// $this->assertEquals($asset->assetLoc->id, $target->userLoc->id);
// $this->assertEquals('user', $asset->assignedType());
// $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id);
// $this->tester->seeRecord('action_logs', [
// 'action_type' => 'checkout',
// 'target_type' => get_class($target),
// 'target_id' => $target->id
// ]);
private function checkin($asset, $target) {
$asset->expected_checkin = null;
$asset->last_checkout = null;
$asset->assigned_to = null;
$asset->assigned_type = null;
$asset->location_id = $asset->rtd_location_id;
$asset->assignedTo()->disassociate($asset);
$asset->accepted = null;
$asset->save();
$asset->logCheckin($target, 'Test Checkin');
}
// $this->tester->seeRecord('assets', [
// 'id' => $asset->id,
// 'assigned_to' => $target->id,
// 'assigned_type' => User::class
// ]);
public function testAnAssetCanBeCheckedOut()
{
// This tests Asset::checkOut(), Asset::assignedTo(), Asset::assignedAssets(), Asset::assetLoc(), Asset::assignedType(), defaultLoc()
$asset = $this->createValidAsset();
$adminUser = $this->signIn();
// $this->checkin($asset, $target);
// $this->assertNull($asset->fresh()->assignedTo);
$target = factory(App\Models\User::class)->create([
'location_id' => factory(App\Models\Location::class)->create()
]);
// An Asset Can be checked out to a user, and this should be logged.
$asset->checkOut($target, $adminUser);
$asset->save();
$this->assertInstanceOf(App\Models\User::class, $asset->assignedTo);
// $this->tester->seeRecord('action_logs', [
// 'action_type' => 'checkin from',
// 'target_type' => get_class($target),
// 'target_id' => $target->id
// ]);
$this->assertEquals($asset->location->id, $target->userLoc->id);
$this->assertEquals('user', $asset->assignedType());
$this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id);
$this->tester->seeRecord('action_logs', [
'action_type' => 'checkout',
'target_type' => get_class($target),
'target_id' => $target->id
]);
// $this->tester->seeRecord('assets', [
// 'id' => $asset->id,
// 'assigned_to' => null,
// 'assigned_type' => null
// ]);
$this->tester->seeRecord('assets', [
'id' => $asset->id,
'assigned_to' => $target->id,
'assigned_type' => User::class
]);
// // An Asset Can be checked out to a asset, and this should be logged.
// $target = factory(App\Models\Asset::class)->create();
// $asset->checkOut($target, $adminUser);
// $asset->save();
// $this->assertInstanceOf(App\Models\Asset::class, $asset->fresh()->assignedTo);
// $this->assertEquals($asset->fresh()->assetLoc->id, $target->fresh()->assetLoc->id);
// $this->assertEquals('asset', $asset->assignedType());
// $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id);
// $this->tester->seeRecord('action_logs', [
// 'action_type' => 'checkout',
// 'target_type' => get_class($target),
// 'target_id' => $target->id
// ]);
$this->checkin($asset, $target);
$this->assertNull($asset->fresh()->assignedTo);
// $this->assertCount(1, $target->assignedAssets);
// $this->checkin($asset, $target);
// $this->assertNull($asset->fresh()->assignedTo);
$this->tester->seeRecord('action_logs', [
'action_type' => 'checkin from',
'target_type' => get_class($target),
'target_id' => $target->id
]);
// $this->tester->seeRecord('action_logs', [
// 'action_type' => 'checkin from',
// 'target_type' => get_class($target),
// 'target_id' => $target->id
// ]);
$this->tester->seeRecord('assets', [
'id' => $asset->id,
'assigned_to' => null,
'assigned_type' => null
]);
// // An Asset Can be checked out to a location, and this should be logged.
// $target = factory(App\Models\Location::class)->create();
// $asset->checkOut($target, $adminUser);
// $asset->save();
// $this->assertInstanceOf(App\Models\Location::class, $asset->fresh()->assignedTo);
// $this->assertEquals($asset->fresh()->assetLoc->id, $target->fresh()->id);
// $this->assertEquals('location', $asset->assignedType());
// $this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id);
// $this->tester->seeRecord('action_logs', [
// 'action_type' => 'checkout',
// 'target_type' => get_class($target),
// 'target_id' => $target->id
// ]);
// $this->checkin($asset, $target);
// $this->assertNull($asset->fresh()->assignedTo);
// An Asset Can be checked out to a asset, and this should be logged.
$target = $this->createValidAsset();
// $this->tester->seeRecord('action_logs', [
// 'action_type' => 'checkin from',
// 'target_type' => get_class($target),
// 'target_id' => $target->id
// ]);
// }
$asset->checkOut($target, $adminUser);
$asset->save();
$this->assertInstanceOf(App\Models\Asset::class, $asset->fresh()->assignedTo);
$this->assertEquals($asset->fresh()->location->id, $target->fresh()->location->id);
$this->assertEquals('asset', $asset->assignedType());
$this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id);
$this->tester->seeRecord('action_logs', [
'action_type' => 'checkout',
'target_type' => get_class($target),
'target_id' => $target->id
]);
// public function testAnAssetHasMaintenances()
// {
// $asset = factory(Asset::class)->create();
// factory(App\Models\AssetMaintenance::class)->create(['asset_id' => $asset->id]);
// $this->assertCount(1, $asset->assetmaintenances);
// }
$this->assertCount(1, $target->assignedAssets);
$this->checkin($asset, $target);
$this->assertNull($asset->fresh()->assignedTo);
// public function testAnAssetThatRequiresAcceptanceCanNotBeCheckedOutToANonUser()
// {
// $this->expectException(CheckoutNotAllowed::class);
// $this->signIn();
$this->tester->seeRecord('action_logs', [
'action_type' => 'checkin from',
'target_type' => get_class($target),
'target_id' => $target->id
]);
// $asset = factory(Asset::class)->states('requires-acceptance')->create();
// An Asset Can be checked out to a location, and this should be logged.
$target = $this->createValidLocation();
// $location = factory(Location::class)->create();
// $asset->checkOut($location);
// }
$asset->checkOut($target, $adminUser);
$asset->save();
$this->assertInstanceOf(App\Models\Location::class, $asset->fresh()->assignedTo);
$this->assertEquals($asset->fresh()->location->id, $target->fresh()->id);
$this->assertEquals('location', $asset->assignedType());
$this->assertEquals($asset->defaultLoc->id, $asset->rtd_location_id);
$this->tester->seeRecord('action_logs', [
'action_type' => 'checkout',
'target_type' => get_class($target),
'target_id' => $target->id
]);
$this->checkin($asset, $target);
$this->assertNull($asset->fresh()->assignedTo);
$this->tester->seeRecord('action_logs', [
'action_type' => 'checkin from',
'target_type' => get_class($target),
'target_id' => $target->id
]);
}
public function testAnAssetHasMaintenances()
{
$asset = $this->createValidAsset();
factory(App\Models\AssetMaintenance::class)->create(['asset_id' => $asset->id]);
$this->assertCount(1, $asset->assetmaintenances);
}
}

70
tests/unit/BaseTest.php
View file

@ -22,4 +22,74 @@ class BaseTest extends \Codeception\TestCase\Test
return $user;
}
protected function createValidAssetModel($state = 'mbp-13-model', $overrides = [])
{
return factory(\App\Models\AssetModel::class)->states($state)->create(array_merge([
'category_id' => $this->createValidCategory(),
'manufacturer_id' => $this->createValidManufacturer(),
'depreciation_id' => $this->createValidDepreciation(),
],$overrides));
}
protected function createValidCategory($state = 'asset-laptop-category', $overrides = [])
{
return factory(App\Models\Category::class)->states($state)->create($overrides);
}
protected function createValidCompany($overrides = [])
{
return factory(App\Models\Company::class)->create($overrides);
}
protected function createValidDepartment($state = 'engineering', $overrides = [])
{
return factory(App\Models\Department::class)->states($state)->create(array_merge([
'location_id' => $this->createValidLocation()->id
], $overrides));
}
protected function createValidDepreciation($state = 'computer', $overrides = [])
{
return factory(App\Models\Depreciation::class)->states($state)->create($overrides);
}
protected function createValidLocation($overrides = [])
{
return factory(App\Models\Location::class)->create($overrides);
}
protected function createValidManufacturer($state = 'apple', $overrides = [])
{
return factory(App\Models\Manufacturer::class)->states($state)->create($overrides);
}
protected function createValidSupplier($overrides = [])
{
return factory(App\Models\Supplier::class)->create($overrides);
}
protected function createValidStatuslabel($state = 'rtd', $overrides= [])
{
return factory(App\Models\Statuslabel::class)->states($state)->create($overrides);
}
protected function createValidUser($overrides= [])
{
return factory(App\Models\User::class)->create($overrides);
}
protected function createValidAsset($overrides = [])
{
$locId = $this->createValidLocation();
$this->createValidAssetModel();
return factory(\App\Models\Asset::class)->states('laptop-mbp')->create([
'rtd_location_id' => $locId,
'location_id' => $locId
], $overrides);
}
}

119
tests/unit/CategoryTest.php
View file

@ -12,84 +12,59 @@ class CategoryTest extends BaseTest
*/
protected $tester;
// public function testAssetCategoryAdd()
// {
// $category = factory(Category::class)->make(['category_type' => 'asset']);
// $values = [
// 'name' => $category->name,
// 'category_type' => $category->category_type,
// 'require_acceptance' => true,
// 'use_default_eula' => false
// ];
public function testFailsEmptyValidation()
{
// An Asset requires a name, a qty, and a category_id.
$a = Category::create();
$this->assertFalse($a->isValid());
// Category::create($values);
// $this->tester->seeRecord('categories', $values);
// }
$fields = [
'name' => 'name',
'category_type' => 'category type'
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
// public function testAccessoryCategoryAdd()
// {
// $category = factory(Category::class)->make(['category_type' => 'accessory']);
// $values = [
// 'name' => $category->name,
// 'category_type' => $category->category_type,
// 'require_acceptance' => true,
// 'use_default_eula' => false
// ];
public function testACategoryCanHaveAssets()
{
$this->createValidAssetModel(); //This will seed various things to make the following work better.
$category = $this->createValidCategory('asset-desktop-category');
$models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['category_id' => $category->id]);
// Category::create($values);
// $this->tester->seeRecord('categories', $values);
// }
$this->assertEquals(5, $category->has_models());
$this->assertCount(5, $category->models);
// public function testFailsEmptyValidation()
// {
// // An Asset requires a name, a qty, and a category_id.
// $a = Category::create();
// $this->assertFalse($a->isValid());
$models->each(function($model) {
factory(App\Models\Asset::class, 2)->create(['model_id' => $model->id]);
});
$this->assertEquals(10, $category->itemCount());
}
// $fields = [
// 'name' => 'name',
// 'category_type' => 'category type'
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
public function testACategoryCanHaveAccessories()
{
$category = $this->createValidCategory('accessory-keyboard-category');
factory(App\Models\Accessory::class, 5)->states('apple-bt-keyboard')->create(['category_id' => $category->id]);
// public function testACategoryCanHaveAssets()
// {
// $category = factory(Category::class)->create(['category_type' => 'asset']);
// $models = factory(App\Models\AssetModel::class, 5)->create(['category_id' => $category->id]);
// $this->assertEquals(5, $category->has_models());
// $this->assertCount(5, $category->models);
$this->assertCount(5, $category->accessories);
$this->assertEquals(5, $category->itemCount());
}
// $models->each(function($model) {
// factory(App\Models\Asset::class, 2)->create(['model_id' => $model->id]);
// });
// $this->assertEquals(10, $category->itemCount());
// }
public function testACategoryCanHaveConsumables()
{
$category = $this->createValidCategory('consumable-paper-category');
factory(App\Models\Consumable::class, 5)->states('cardstock')->create(['category_id' => $category->id]);
$this->assertCount(5, $category->consumables);
$this->assertEquals(5, $category->itemCount());
}
// public function testACategoryCanHaveAccessories()
// {
// $category = factory(Category::class)->create(['category_type' => 'accessory']);
// factory(App\Models\Accessory::class, 5)->create(['category_id' => $category->id]);
// $this->assertCount(5, $category->accessories);
// $this->assertEquals(5, $category->itemCount());
// }
// public function testACategoryCanHaveConsumables()
// {
// $category = factory(Category::class)->create(['category_type' => 'consumable']);
// factory(App\Models\Consumable::class, 5)->create(['category_id' => $category->id]);
// $this->assertCount(5, $category->consumables);
// $this->assertEquals(5, $category->itemCount());
// }
// public function testACategoryCanHaveComponents()
// {
// $category = factory(Category::class)->create(['category_type' => 'component']);
// factory(App\Models\Component::class, 5)->create(['category_id' => $category->id]);
// $this->assertCount(5, $category->components);
// $this->assertEquals(5, $category->itemCount());
// }
public function testACategoryCanHaveComponents()
{
$category = $this->createValidCategory('component-ram-category');
factory(App\Models\Component::class, 5)->states('ram-crucial4')->create(['category_id' => $category->id]);
$this->assertCount(5, $category->components);
$this->assertEquals(5, $category->itemCount());
}
}

123
tests/unit/CompanyTest.php
View file

@ -12,71 +12,78 @@ class CompanyTest extends BaseTest
*/
protected $tester;
// public function testCompanyAdd()
// {
// $company = factory(Company::class)->make();
// $values = [
// 'name' => $company->name,
// ];
// Company::create($values);
// $this->tester->seeRecord('companies', $values);
// }
public function testFailsEmptyValidation()
{
// An Company requires a name, a qty, and a category_id.
$a = Company::create();
$this->assertFalse($a->isValid());
// public function testFailsEmptyValidation()
// {
// // An Company requires a name, a qty, and a category_id.
// $a = Company::create();
// $this->assertFalse($a->isValid());
$fields = [
'name' => 'name',
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
// $fields = [
// 'name' => 'name',
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
public function testACompanyCanHaveUsers()
{
$company = $this->createValidCompany();
factory(App\Models\User::class, 1)->create(['company_id'=>$company->id]);
$this->assertCount(1, $company->users);
}
// public function testACompanyCanHaveUsers()
// {
// $company = factory(Company::class)->create();
// factory(App\Models\User::class, 1)->create(['company_id'=>$company->id]);
// $this->assertCount(1, $company->users);
// }
public function testACompanyCanHaveAssets()
{
$company = $this->createValidCompany();
factory(App\Models\Asset::class, 1)->states('laptop-mbp')->create([
'company_id' => $company->id,
'model_id' => $this->createValidAssetModel()->id
]);
$this->assertCount(1, $company->assets);
}
// public function testACompanyCanHaveAssets()
// {
// $company = factory(Company::class)->create();
// factory(App\Models\Asset::class, 1)->create(['company_id'=>$company->id]);
// $this->assertCount(1, $company->assets);
// }
public function testACompanyCanHaveLicenses()
{
$company = $this->createValidCompany();
factory(App\Models\License::class, 1)->states('acrobat')->create([
'company_id'=>$company->id,
'manufacturer_id' => factory(App\Models\Manufacturer::class)->states('adobe')->create()->id,
'category_id' => factory(App\Models\Category::class)->states('license-office-category')->create()->id
]);
$this->assertCount(1, $company->licenses);
}
// public function testACompanyCanHaveLicenses()
// {
// $company = factory(Company::class)->create();
// factory(App\Models\License::class, 1)->create(['company_id'=>$company->id]);
// $this->assertCount(1, $company->licenses);
// }
public function testACompanyCanHaveAccessories()
{
$company = $this->createValidCompany();
$a = factory(App\Models\Accessory::class)->states('apple-bt-keyboard')->create([
'category_id' => factory(App\Models\Category::class)->states('accessory-keyboard-category')->create()->id,
'company_id' => $company->id
]);
// public function testACompanyCanHaveAccessories()
// {
// $company = factory(Company::class)->create();
// factory(App\Models\Accessory::class, 1)->create(['company_id'=>$company->id]);
// $this->assertCount(1, $company->accessories);
// }
$this->assertCount(1, $company->accessories);
}
// public function testACompanyCanHaveConsumables()
// {
// $company = factory(Company::class)->create();
// factory(App\Models\Consumable::class, 1)->create(['company_id'=>$company->id]);
// $this->assertCount(1, $company->consumables);
// }
public function testACompanyCanHaveConsumables()
{
$company = $this->createValidCompany();
factory(App\Models\Consumable::class, 1)->states('cardstock')->create([
'company_id' => $company->id,
'category_id' => factory(App\Models\Category::class)->states('consumable-paper-category')->create()->id
]);
$this->assertCount(1, $company->consumables);
}
// public function testACompanyCanHaveComponents()
// {
// $company = factory(Company::class)->create();
// factory(App\Models\Component::class, 1)->create(['company_id'=>$company->id]);
// $this->assertCount(1, $company->components);
// }
public function testACompanyCanHaveComponents()
{
$company = $this->createValidCompany();
factory(App\Models\Component::class, 1)->states('ram-crucial4')->create([
'company_id'=>$company->id,
'category_id' => factory(App\Models\Category::class)->states('component-ram-category')->create()->id
]);
$this->assertCount(1, $company->components);
}
}

68
tests/unit/ConsumableTest.php
View file

@ -12,45 +12,39 @@ class ConsumableTest extends BaseTest
*/
protected $tester;
// public function testConsumableAdd()
// {
// $consumable = factory(Consumable::class)->make();
// $values = [
// 'name' => $consumable->name,
// 'qty' => $consumable->qty,
// 'category_id' => $consumable->category_id,
// 'company_id' => $consumable->company_id,
// ];
// Consumable::create($values);
// $this->tester->seeRecord('consumables', $values);
// }
public function testFailsEmptyValidation()
{
// An Consumable requires a name, a qty, and a category_id.
$a = Consumable::create();
$this->assertFalse($a->isValid());
// public function testFailsEmptyValidation()
// {
// // An Consumable requires a name, a qty, and a category_id.
// $a = Consumable::create();
// $this->assertFalse($a->isValid());
$fields = [
'name' => 'name',
'qty' => 'qty',
'category_id' => 'category id'
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
// $fields = [
// 'name' => 'name',
// 'qty' => 'qty',
// 'category_id' => 'category id'
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
// public function testAConsumableHasRelationships()
// {
// $consumable = factory(Consumable::class)->create();
// $this->assertInstanceOf(App\Models\User::class, $consumable->admin);
// $this->assertInstanceOf(App\Models\Company::class, $consumable->company);
// $this->assertInstanceOf(App\Models\Manufacturer::class, $consumable->manufacturer);
// $this->assertInstanceOf(App\Models\Location::class, $consumable->location);
// $this->assertInstanceOf(App\Models\Category::class, $consumable->category);
// }
public function testAConsumableHasRelationships()
{
$consumable = factory(Consumable::class)->states('cardstock')->create([
'category_id' => $this->createValidCategory('consumable-paper-category')->id,
'manufacturer_id' => $this->createValidManufacturer('apple')->id,
'company_id' => $this->createValidCompany()->id,
'location_id' => $this->createValidLocation()->id,
'user_id' => $this->signIn()->id
]);
$this->assertInstanceOf(App\Models\User::class, $consumable->admin);
$this->assertInstanceOf(App\Models\Company::class, $consumable->company);
$this->assertInstanceOf(App\Models\Manufacturer::class, $consumable->manufacturer);
$this->assertInstanceOf(App\Models\Location::class, $consumable->location);
$this->assertInstanceOf(App\Models\Category::class, $consumable->category);
}
}

68
tests/unit/DepreciationTest.php
View file

@ -11,45 +11,39 @@ class DepreciationTest extends BaseTest
*/
protected $tester;
// public function testDepreciationAdd()
// {
// $depreciations = factory(Depreciation::class)->make();
// $values = [
// 'name' => $depreciations->name,
// 'months' => $depreciations->months,
// ];
public function testFailsEmptyValidation()
{
// An Asset requires a name, a qty, and a category_id.
$a = Depreciation::create();
$this->assertFalse($a->isValid());
// Depreciation::create($values);
// $this->tester->seeRecord('depreciations', $values);
// }
$fields = [
'name' => 'name',
'months' => 'months',
];
$errors = $a->getErrors();
foreach ($fields as $field => $fieldTitle) {
$this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
}
}
// public function testFailsEmptyValidation()
// {
// // An Asset requires a name, a qty, and a category_id.
// $a = Depreciation::create();
// $this->assertFalse($a->isValid());
public function testADepreciationHasModels()
{
$this->createValidAssetModel();
$depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']);
$models = factory(App\Models\AssetModel::class, 5)->states('mbp-13-model')->create(['depreciation_id'=>$depreciation->id]);
$this->assertEquals(5,$depreciation->has_models());
}
// $fields = [
// 'name' => 'name',
// 'months' => 'months',
// ];
// $errors = $a->getErrors();
// foreach ($fields as $field => $fieldTitle) {
// $this->assertEquals($errors->get($field)[0], "The ${fieldTitle} field is required.");
// }
// }
public function testADepreciationHasLicenses()
{
$category = $this->createValidCategory('license-graphics-category');
$depreciation = $this->createValidDepreciation('computer', ['name' => 'New Depreciation']);
$licenses = factory(App\Models\License::class, 5)->states('photoshop')->create([
'depreciation_id'=>$depreciation->id,
'category_id' => $category->id
]);
// public function testADepreciationHasModels()
// {
// $depreciation = factory(Depreciation::class)->create();
// factory(App\Models\AssetModel::class, 5)->create(['depreciation_id'=>$depreciation->id]);
// $this->assertEquals(5,$depreciation->has_models());
// }
// public function testADepreciationHasLicenses()
// {
// $depreciation = factory(Depreciation::class)->create();
// factory(App\Models\License::class, 5)->create(['depreciation_id'=>$depreciation->id]);
// $this->assertEquals(5,$depreciation->has_licenses());
// }
$this->assertEquals(5,$depreciation->has_licenses());
}
}

38
tests/unit/NotificationTest.php
View file

@ -19,31 +19,17 @@ class NotificationTest extends BaseTest
*/
protected $tester;
// public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA()
// {
// $admin = factory(User::class)->states('superuser')->create();
// Auth::login($admin);
// $cat = factory(Category::class)->states('asset-category', 'requires-acceptance')->create();
// $model = factory(AssetModel::class)->create(['category_id' => $cat->id]);
// $asset = factory(Asset::class)->create(['model_id' => $model->id]);
public function testAUserIsEmailedIfTheyCheckoutAnAssetWithEULA()
{
$admin = factory(User::class)->states('superuser')->create();
Auth::login($admin);
$cat = $this->createValidCategory('asset-laptop-category', ['require_acceptance' => true]);
$model = $this->createValidAssetModel('mbp-13-model', ['category_id' => $cat->id]);
$asset = $this->createValidAsset(['model_id' => $model->id]);
$user = factory(User::class)->create();
Notification::fake();
$asset->checkOut($user, 1);
// $user = factory(User::class)->create();
// Notification::fake();
// $asset->checkOut($user, 1);
// Notification::assertSentTo($user, CheckoutNotification::class);
// }
// public function testAnAssetRequiringAEulaDoesNotExplodeWhenCheckedOutToALocation()
// {
// $this->signIn();
// $asset = factory(Asset::class)->states('requires-acceptance')->create();
// $this->expectException(CheckoutNotAllowed::class);
// $location = factory(Location::class)->create();
// Notification::fake();
// $asset->checkOut($location, 1);
// Notification::assertNotSentTo($location, CheckoutNotification::class);
// }
Notification::assertSentTo($user, CheckoutAssetNotification::class);
}
}

168
tests/unit/StatuslabelTest.php
View file

@ -12,102 +12,102 @@ class StatuslabelTest extends BaseTest
*/
protected $tester;
// public function testRTDStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('rtd')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
public function testRTDStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('rtd')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
// ];
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
// public function testPendingStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('pending')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
// ];
public function testPendingStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('pending')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
// public function testArchivedStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('archived')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
// ];
public function testArchivedStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('archived')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
// public function testOutForRepairStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('out_for_repair')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
// ];
public function testOutForRepairStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('out_for_repair')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
// public function testOutForDiagnosticsStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('out_for_diagnostics')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
// ];
public function testOutForDiagnosticsStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('out_for_diagnostics')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
// public function testBrokenStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('broken')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
// ];
public function testBrokenStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('broken')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
// public function testLostStatuslabelAdd()
// {
// $statuslabel = factory(Statuslabel::class)->states('lost')->make();
// $values = [
// 'name' => $statuslabel->name,
// 'deployable' => $statuslabel->deployable,
// 'pending' => $statuslabel->pending,
// 'archived' => $statuslabel->archived,
// ];
public function testLostStatuslabelAdd()
{
$statuslabel = factory(Statuslabel::class)->states('lost')->make();
$values = [
'name' => $statuslabel->name,
'deployable' => $statuslabel->deployable,
'pending' => $statuslabel->pending,
'archived' => $statuslabel->archived,
];
// Statuslabel::create($values);
// $this->tester->seeRecord('status_labels', $values);
// }
Statuslabel::create($values);
$this->tester->seeRecord('status_labels', $values);
}
}