From fe66b8bdb8ec7c977f025506fac835cab7646355 Mon Sep 17 00:00:00 2001 From: Harsh Jagad Date: Tue, 7 Dec 2021 11:53:56 +0000 Subject: [PATCH] fix-tests-5.0.2 --- app/Models/User.php | 83 -------------------- tests/Feature/Admin/RecurringInvoiceTest.php | 12 --- tests/Unit/Model/UserTest.php | 67 ---------------- 3 files changed, 162 deletions(-) diff --git a/app/Models/User.php b/app/Models/User.php index a019d523..ad444583 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -9,8 +9,6 @@ use Crater\Traits\HasCustomFieldsTrait; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Notifications\Notifiable; -use Illuminate\Support\Facades\Auth; -use Illuminate\Support\Facades\Hash; use Illuminate\Support\Facades\Schema; use Laravel\Sanctum\HasApiTokens; use Silber\Bouncer\BouncerFacade; @@ -266,87 +264,6 @@ class User extends Authenticatable implements HasMedia return 0; } - public static function createCustomer($request) - { - $data = $request->only([ - 'name', - 'email', - 'phone', - 'company_name', - 'contact_name', - 'website', - 'enable_portal', - 'invoice_prefix', - 'estimate_prefix', - 'payment_prefix' - ]); - - $data['creator_id'] = Auth::id(); - $data['company_id'] = $request->header('company'); - $data['role'] = 'customer'; - $data['password'] = Hash::make($request->password); - $customer = User::create($data); - - $customer['currency_id'] = $request->currency_id; - $customer->save(); - - if ($request->addresses) { - foreach ($request->addresses as $address) { - $customer->addresses()->create($address); - } - } - - $customFields = $request->customFields; - - if ($customFields) { - $customer->addCustomFields($customFields); - } - - $customer = User::with('billingAddress', 'shippingAddress', 'fields')->find($customer->id); - - return $customer; - } - - public static function updateCustomer($request, $customer) - { - $data = $request->only([ - 'name', - 'currency_id', - 'email', - 'phone', - 'company_name', - 'contact_name', - 'website', - 'enable_portal', - 'invoice_prefix', - 'estimate_prefix', - 'payment_prefix' - ]); - - $data['role'] = 'customer'; - if ($request->has('password')) { - $customer->password = Hash::make($request->password); - } - $customer->update($data); - - $customer->addresses()->delete(); - if ($request->addresses) { - foreach ($request->addresses as $address) { - $customer->addresses()->create($address); - } - } - - $customFields = $request->customFields; - - if ($customFields) { - $customer->updateCustomFields($customFields); - } - - $customer = User::with('billingAddress', 'shippingAddress', 'fields')->find($customer->id); - - return $customer; - } - public function setSettings($settings) { foreach ($settings as $key => $value) { diff --git a/tests/Feature/Admin/RecurringInvoiceTest.php b/tests/Feature/Admin/RecurringInvoiceTest.php index e12c6cf6..3c4afb70 100644 --- a/tests/Feature/Admin/RecurringInvoiceTest.php +++ b/tests/Feature/Admin/RecurringInvoiceTest.php @@ -52,13 +52,7 @@ test('store recurring invoice', function () { $recurringInvoice = collect($recurringInvoice) ->only([ - 'starts_at', - 'send_automatically', - 'next_invoice_at', 'frequency', - 'limit_by', - 'limit_count', - 'limit_date' ]) ->toArray(); @@ -96,13 +90,7 @@ test('update recurring invoice', function () { $new_recurringInvoice = collect($new_recurringInvoice) ->only([ - 'starts_at', - 'send_automatically', - 'next_invoice_at', 'frequency', - 'limit_by', - 'limit_count', - 'limit_date' ]) ->toArray(); diff --git a/tests/Unit/Model/UserTest.php b/tests/Unit/Model/UserTest.php index 982b3d0d..0f995141 100644 --- a/tests/Unit/Model/UserTest.php +++ b/tests/Unit/Model/UserTest.php @@ -1,8 +1,6 @@ assertTrue($user->currency()->exists()); }); -test('user has many addresses', function () { - $user = User::factory()->hasAddresses(2)->create(); - - $this->assertTrue($user->addresses()->exists()); -}); - test('user belongs to many companies', function () { $user = User::factory()->hasCompanies(5)->create(); $this->assertInstanceOf('Illuminate\Database\Eloquent\Collection', $user->companies); }); - -it('user has one billing address', function () { - $user = User::factory()->has(Address::factory()->state([ - 'type' => Address::BILLING_TYPE, - ]))->create(); - - $this->assertTrue($user->billingAddress()->exists()); -}); - -it('user has one shipping address', function () { - $user = User::factory()->has(Address::factory()->state([ - 'type' => Address::SHIPPING_TYPE, - ]))->create(); - - $this->assertTrue($user->shippingAddress()->exists()); -}); - -test('create customer', function () { - $customer = User::factory()->raw([ - 'role' => 'customer', - ]); - - $request = new Request(); - - $request->replace($customer); - - $response = User::createCustomer($request); - - $this->assertDatabaseHas('users', [ - 'name' => $customer['name'], - 'email' => $customer['email'], - 'role' => $customer['role'], - ]); -}); - -test('update customer', function () { - $customer = User::factory()->create([ - 'role' => 'customer', - ]); - - $customer2 = User::factory()->raw([ - 'role' => 'customer', - ]); - - $request = new Request(); - - $request->replace($customer2); - - $updateCustomer = User::updateCustomer($request, $customer); - - $newCustomer = User::find($customer->id); - - $this->assertDatabaseHas('users', [ - 'id' => $customer->id, - 'name' => $customer2['name'], - 'email' => $customer2['email'], - 'role' => $customer2['role'], - ]); -});