v2 first commit

tests/Feature/Banking/AccountsTest.php

@@ -26,9 +26,8 @@ class AccountsTest extends FeatureTestCase
     public function testItShouldCreateAccount()
     {
         $this->loginAs()
-            ->post(url('banking/accounts'), $this->getAccountRequest())
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/accounts'));
+            ->post(route('accounts.index'), $this->getAccountRequest())
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
@@ -52,9 +51,8 @@ class AccountsTest extends FeatureTestCase
         $request['name'] = $this->faker->text(5);
 
         $this->loginAs()
-            ->patch(url('banking/accounts', $account->id), $request)
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/accounts'));
+            ->patch(route('accounts.update', ['account' => $account->id]), $request)
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
@@ -65,8 +63,7 @@ class AccountsTest extends FeatureTestCase
 
         $this->loginAs()
             ->delete(route('accounts.destroy', ['account' => $account]))
-            ->assertStatus(302)
-            ->assertRedirect(route('accounts.index'));
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
@@ -77,7 +74,7 @@ class AccountsTest extends FeatureTestCase
 	        'company_id' => $this->company->id,
 	        'name' => $this->faker->text(5),
 	        'number' => '1',
-	        'currency_code' => setting('general.default_currency'),
+	        'currency_code' => setting('default.currency'),
 	        'opening_balance' => 0,
 	        'bank_name' => $this->faker->text(5),
 	        'bank_phone' => null,

tests/Feature/Banking/ReconciliationsTest.php

@@ -26,9 +26,8 @@ class ReconciliationsTest extends FeatureTestCase
     public function testItShouldCreateReconciliation()
     {
         $this->loginAs()
-            ->post(url('banking/reconciliations'), $this->getReconciliationRequest())
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/reconciliations'));
+            ->post(route('reconciliations.store'), $this->getReconciliationRequest())
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
@@ -52,9 +51,8 @@ class ReconciliationsTest extends FeatureTestCase
         $request['description'] = $this->faker->text(10);
 
         $this->loginAs()
-            ->patch(url('banking/reconciliations', $reconciliation->id), $request)
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/reconciliations'));
+            ->patch(route('reconciliations.update', $reconciliation->id), $request)
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
@@ -65,8 +63,7 @@ class ReconciliationsTest extends FeatureTestCase
 
         $this->loginAs()
             ->delete(route('reconciliations.destroy', ['reconciliation' => $reconciliation]))
-            ->assertStatus(302)
-            ->assertRedirect(route('reconciliations.index'));
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
@@ -77,7 +74,7 @@ class ReconciliationsTest extends FeatureTestCase
         return [
             'company_id' => $this->company->id,
             'account_id' => '1',
-            'currency_code' => setting('general.default_currency'),
+            'currency_code' => setting('default.currency'),
             'opening_balance' => '0',
             'closing_balance' => '10',
             'started_at' => $this->faker->date(),

tests/Feature/Banking/TransfersTest.php

@@ -3,8 +3,7 @@
 namespace Tests\Feature\Banking;
 
 use App\Models\Banking\Transfer;
-use App\Models\Expense\Payment;
-use App\Models\Income\Revenue;
+use App\Models\Banking\Transaction;
 use Illuminate\Http\UploadedFile;
 use Tests\Feature\FeatureTestCase;
 
@@ -28,90 +27,79 @@ class TransfersTest extends FeatureTestCase
 
     public function testItShouldCreateTransfer()
     {
-        // Create Revenue
-        $revenue_request = $this->getRevenueRequest();
-        $revenue = Revenue::create($revenue_request);
+        // Create income
+        $income_transaction = Transaction::create($this->getIncomeRequest());
 
-        // Create Payment
-        $payment_request = $this->getPaymentRequest();
-        $payment = Payment::create($payment_request);
+        // Create expense
+        $expense_transaction = Transaction::create($this->getExpenseRequest());
 
         $this->loginAs()
-            ->post(url('banking/transfers'), $this->getTransferRequest($revenue, $payment))
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/transfers'));
+            ->post(route('transfers.store'), $this->getTransferRequest($income_transaction, $expense_transaction))
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
 
     public function testItShouldSeeTransferUpdatePage()
     {
-        // Create Revenue
-        $revenue_request = $this->getRevenueRequest();
-        $revenue = Revenue::create($revenue_request);
+        // Create income
+        $income_transaction = Transaction::create($this->getIncomeRequest());
 
-        // Create Payment
-        $payment_request = $this->getPaymentRequest();
-        $payment = Payment::create($payment_request);
+        // Create expense
+        $expense_transaction = Transaction::create($this->getExpenseRequest());
 
-        $transfer = Transfer::create($this->getTransferRequest($revenue, $payment));
+        $transfer = Transfer::create($this->getTransferRequest($income_transaction, $expense_transaction));
 
         $this->loginAs()
             ->get(route('transfers.edit', ['transfer' => $transfer->id]))
             ->assertStatus(200)
-            ->assertSee($payment->description);
-    }
-
-    public function testItShouldDeleteTransfer()
-    {
-        // Create Revenue
-        $revenue_request = $this->getRevenueRequest();
-        $revenue = Revenue::create($revenue_request);
-
-        // Create Payment
-        $payment_request = $this->getPaymentRequest();
-        $payment = Payment::create($payment_request);
-
-        $transfer = Transfer::create($this->getTransferRequest($revenue, $payment));
-
-        $this->loginAs()
-            ->delete(url('banking/transfers', ['transfer' => $transfer->id]))
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/transfers'));
-
-        $this->assertFlashLevel('success');
+            ->assertSee($expense_transaction->description);
     }
 
     public function testItShouldUpdateTransfer()
     {
-        // Create Revenue
-        $revenue_request = $this->getRevenueRequest();
-        $revenue = Revenue::create($revenue_request);
+        // Create income
+        $income_transaction = Transaction::create($this->getIncomeRequest());
 
-        // Create Payment
-        $payment_request = $this->getPaymentRequest();
-        $payment = Payment::create($payment_request);
+        // Create expense
+        $expense_transaction = Transaction::create($this->getExpenseRequest());
 
-        $request = $this->getTransferRequest($revenue, $payment);
+        $request = $this->getTransferRequest($income_transaction, $expense_transaction);
 
         $transfer = Transfer::create($request);
 
         $request['description'] = $this->faker->text(10);
 
         $this->loginAs()
-            ->patch(url('banking/transfers', ['transfer' => $transfer->id]), $request)
-            ->assertStatus(302)
-            ->assertRedirect(url('banking/transfers'));
+            ->patch(route('transfers.update', ['transfer' => $transfer->id]), $request)
+            ->assertStatus(200);
 
         $this->assertFlashLevel('success');
     }
 
-    private function getTransferRequest($revenue, $payment)
+    public function testItShouldDeleteTransfer()
+    {
+        // Create income
+        $income_transaction = Transaction::create($this->getIncomeRequest());
+
+        // Create expense
+        $expense_transaction = Transaction::create($this->getExpenseRequest());
+
+        $transfer = Transfer::create($this->getTransferRequest($income_transaction, $expense_transaction));
+
+        $this->loginAs()
+            ->delete(route('transfers.destroy', ['transfer' => $transfer->id]))
+            ->assertStatus(200);
+
+        $this->assertFlashLevel('success');
+    }
+
+    private function getTransferRequest($income_transaction, $expense_transaction)
     {
         return [
             'company_id' => $this->company->id,
-            'revenue_id' => $revenue->id,
-            'payment_id' => $payment->id,
+            'income_transaction_id' => $income_transaction->id,
+            'expense_transaction_id' => $expense_transaction->id,
             'from_account_id' => '1',
             'to_account_id' => '2',
             'amount' => '5',
@@ -119,46 +107,46 @@ class TransfersTest extends FeatureTestCase
             'description'=> $this->faker->text(5),
             'payment_method' => 'offlinepayment.cash.1',
             'reference' => null,
-            'currency_code' => setting('general.default_currency'),
+            'currency_code' => setting('default.currency'),
             'currency_rate' => '1'
         ];
     }
 
-    private function getRevenueRequest()
+    private function getIncomeRequest()
     {
         $attachment = UploadedFile::fake()->create('image.jpg');
 
         return [
             'company_id' => $this->company->id,
-            'customer_id' => '',
-            'account_id' => setting('general.default_account'),
+            'type' => 'income',
+            'account_id' => setting('default.account'),
             'paid_at' => $this->faker->date(),
             'amount' => $this->faker->randomFloat(2, 2),
-            'currency_code' => setting('general.default_currency'),
+            'currency_code' => setting('default.currency'),
             'currency_rate' => '1',
             'description' => $this->faker->text(5),
             'category_id' => $this->company->categories()->type('income')->first()->id,
             'reference' => $this->faker->text(5),
-            'payment_method' => setting('general.default_payment_method'),
+            'payment_method' => setting('default.payment_method'),
             'attachment' => $attachment
         ];
     }
 
-    private function getPaymentRequest()
+    private function getExpenseRequest()
     {
         $attachment = UploadedFile::fake()->create('image.jpg');
 
         return [
             'company_id' => $this->company->id,
-            'account_id' => setting('general.default_account'),
-            'vendor_id' => '',
+            'type' => 'expense',
+            'account_id' => setting('default.account'),
             'paid_at' => $this->faker->date(),
             'amount' => $this->faker->randomFloat(2, 2),
-            'currency_code' => setting('general.default_currency'),
+            'currency_code' => setting('default.currency'),
             'currency_rate' => '1',
             'description' => $this->faker->text(5),
             'category_id' => $this->company->categories()->type('expense')->first()->id,
-            'payment_method' => setting('general.default_payment_method'),
+            'payment_method' => setting('default.payment_method'),
             'reference' => $this->faker->text(5),
             'attachment' => $attachment
         ];