From f927e08d41cc27a44c11bef9444301485b735071 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Thu, 25 Jun 2020 21:52:04 +1000
Subject: [PATCH] Fixes for tests

---
 routes/web.php                        |  2 -
 tests/Feature/AccountTest.php         | 68 ---------------------------
 tests/Feature/InvitationTest.php      | 15 ++++--
 tests/Integration/UniqueEmailTest.php | 13 ++++-
 4 files changed, 21 insertions(+), 77 deletions(-)
 delete mode 100644 tests/Feature/AccountTest.php

diff --git a/routes/web.php b/routes/web.php
index 40560c851dd5..08e26b71c171 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -3,8 +3,6 @@
  * Signup Routes
  */
 
-use Omnipay\Omnipay;
-
 Route::get('/', 'BaseController@flutterRoute')->middleware('guest');
 Route::get('setup', 'SetupController@index')->middleware('guest');
 Route::post('setup/check_db', 'SetupController@checkDB')->middleware('guest');
diff --git a/tests/Feature/AccountTest.php b/tests/Feature/AccountTest.php
deleted file mode 100644
index 3b7423c55625..000000000000
--- a/tests/Feature/AccountTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use App\Jobs\Account\CreateAccount;
-use App\Models\Account;
-use App\Models\Client;
-use App\Models\User;
-use App\Utils\Traits\UserSessionAttributes;
-use Faker\Factory;
-use Illuminate\Database\Eloquent\Model;
-use Illuminate\Foundation\Testing\DatabaseTransactions;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Session;
-use Tests\TestCase;
-
-/**
- * @test
- * @covers App\Http\Controllers\AccountController
- */
-
-class AccountTest extends TestCase
-{
-    //use DatabaseTransactions;
-
-    public function setUp() :void
-    {
-        parent::setUp();
-
-        Session::start();
-
-        $this->faker = \Faker\Factory::create();
-
-        Model::reguard();
-
-        if (config('ninja.testvars.travis') !== false) {
-            $this->markTestSkipped('Skip test for CI Testing');
-        }
-    }
-
-    public function testApiAccountCreation()
-    {
-
-        Account::all()->each(function($account) {
-            $account->delete();
-        });
-
-
-        $data = [
-            'first_name' => $this->faker->firstName,
-            'last_name' => $this->faker->lastName,
-            'name' => $this->faker->company,
-            'email' => $this->faker->unique()->safeEmail,
-            'password' => 'ALongAndBrilliantPassword123',
-            'privacy_policy' => 1,
-            'terms_of_service' => 1
-        ];
-
-
-        $response = $this->withHeaders([
-                'X-API-SECRET' => config('ninja.api_secret'),
-            ])->post('/api/v1/signup?include=account', $data);
-
-        $response->assertStatus(200);
-    }
-}
diff --git a/tests/Feature/InvitationTest.php b/tests/Feature/InvitationTest.php
index 3057aa505e85..6a59ff4d7d4d 100644
--- a/tests/Feature/InvitationTest.php
+++ b/tests/Feature/InvitationTest.php
@@ -33,7 +33,8 @@ use Tests\TestCase;
 class InvitationTest extends TestCase
 {
     use MakesHash;
-    use DatabaseTransactions;
+    //use DatabaseTransactions;
+    //use RefreshDatabase;
 
     public function setUp() :void
     {
@@ -56,11 +57,15 @@ class InvitationTest extends TestCase
         $account->default_company_id = $company->id;
         $account->save();
 
-        $user = factory(\App\Models\User::class)->create([
-            'account_id' => $account->id,
-            'confirmation_code' => $this->createDbHash(config('database.default'))
-        ]);
+        $user = User::where('email', 'user@example.com')->first();
 
+        if(!$user)
+        {
+            $user = factory(\App\Models\User::class)->create([
+                'account_id' => $account->id,
+                'confirmation_code' => $this->createDbHash(config('database.default'))
+            ]);
+        }
 
         $userPermissions = collect([
                                     'view_invoice',
diff --git a/tests/Integration/UniqueEmailTest.php b/tests/Integration/UniqueEmailTest.php
index d9aaeef742f1..90ee01f475e5 100644
--- a/tests/Integration/UniqueEmailTest.php
+++ b/tests/Integration/UniqueEmailTest.php
@@ -18,6 +18,8 @@ use Tests\TestCase;
  */
 class UniqueEmailTest extends TestCase
 {
+    use DatabaseTransactions;
+
     protected $rule;
 
     public function setUp() :void
@@ -73,8 +75,15 @@ class UniqueEmailTest extends TestCase
             'account_id' => $account2->id,
         ];
 
-        User::on('db-ninja-01')->create($user);
-        User::on('db-ninja-02')->create($user2);
+        $user_find = User::on('db-ninja-01')->where('email', 'user@example.com')->first();
+
+        if(!$user_find)
+            User::on('db-ninja-01')->create($user);
+        
+        $user_find = User::on('db-ninja-02')->where('email', 'user@example.com')->first();
+
+        if(!$user_find)
+            User::on('db-ninja-02')->create($user2);
     }
 
     public function test_unique_emails_detected_on_database()