fix tests

app/Http/Resources/Contact/Contact.php

@@ -30,20 +30,20 @@ public function toArray($request)
             'information' => [
                 'relationships' => $this->when(! $this->is_partial, [
                     'love' => [
-                        'total' => $this->getRelationshipsByRelationshipTypeGroup('love')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('love')),
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('love')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('love')) ? null : Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('love'))),
                     ],
                     'family' => [
-                        'total' => $this->getRelationshipsByRelationshipTypeGroup('family')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('family')),
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('family')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('family')) ? null : Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('family'))),
                     ],
                     'friend' => [
-                        'total' => $this->getRelationshipsByRelationshipTypeGroup('friend')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('friend')),
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('friend')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('friend')) ? null : Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('friend'))),
                     ],
                     'work' => [
-                        'total' => $this->getRelationshipsByRelationshipTypeGroup('work')->count(),
-                        'contacts' => Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('work')),
+                        'total' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? 0 : $this->getRelationshipsByRelationshipTypeGroup('work')->count()),
+                        'contacts' => (is_null($this->getRelationshipsByRelationshipTypeGroup('work')) ? null : Contact::translateForAPI($this->getRelationshipsByRelationshipTypeGroup('work'))),
                     ],
                 ]),
                 'dates' => [

app/Providers/RouteServiceProvider.php

@@ -95,8 +95,8 @@ public function boot()
             Contact::findOrFail($route->parameter('contact')->id);
 
             Relationship::where('account_id', auth()->user()->account_id)
-                ->where('contact_id_main', $route->parameter('contact')->id)
-                ->where('contact_id_secondary', $value)
+                ->where('contact_is', $route->parameter('contact')->id)
+                ->where('of_contact', $value)
                 ->firstOrFail();
 
             return Contact::findOrFail($value);

tests/Api/Contact/ApiContactControllerTest.php

@@ -14,7 +14,7 @@ public function test_it_gets_a_list_of_contacts()
     {
         $user = $this->signin();
 
-        $contact = factory(Contact::class, 10)->create([
+        $contact = factory('App\Contact', 10)->create([
             'account_id' => $user->account_id,
         ]);
 
@@ -32,7 +32,7 @@ public function test_it_gets_a_list_of_contacts_with_pagination_everytime()
     {
         $user = $this->signin();
 
-        $contact = factory(Contact::class, 10)->create([
+        $contact = factory('App\Contact', 10)->create([
             'account_id' => $user->account_id,
         ]);
 
@@ -48,7 +48,7 @@ public function test_it_applies_the_limit_parameter_in_search()
     {
         $user = $this->signin();
 
-        $contact = factory(Contact::class, 10)->create([
+        $contact = factory('App\Contact', 10)->create([
             'account_id' => $user->account_id,
         ]);
 
@@ -75,13 +75,13 @@ public function test_it_is_possible_to_search_for_a_specific_contact()
     {
         $user = $this->signin();
 
-        $contact = factory(Contact::class)->create([
+        $contact = factory('App\Contact')->create([
             'account_id' => $user->account_id,
             'first_name' => 'roger',
         ]);
 
         // create 10 other contacts named Bob (to avoid random conflicts if we took a random name)
-        $contact = factory(Contact::class, 10)->create([
+        $contact = factory('App\Contact', 10)->create([
             'account_id' => $user->account_id,
             'first_name' => 'bob',
         ]);

tests/Feature/ActivityTest.php

@@ -2,7 +2,6 @@
 
 namespace Tests\Feature;
 
-use App\Contact;
 use Tests\FeatureTestCase;
 use Illuminate\Foundation\Testing\DatabaseTransactions;
 
@@ -19,7 +18,7 @@ private function fetchUser()
     {
         $user = $this->signIn();
 
-        $contact = factory(Contact::class)->create([
+        $contact = factory('App\Contact')->create([
             'account_id' => $user->account_id,
         ]);
 

tests/Traits/SignIn.php

@@ -19,6 +19,9 @@ public function signIn($user = null)
 
         $this->be($user);
 
+        $user->account->populateRelationshipTypeGroupsTable();
+        $user->account->populateRelationshipTypesTable();
+
         return $user;
     }
 }

tests/Unit/RelationshipTest.php

@@ -26,7 +26,7 @@ public function test_it_belongs_to_a_contact()
             'contact_is' => $contact->id,
         ]);
 
-        $this->assertTrue($relationship->contact()->exists());
+        $this->assertTrue($relationship->contactIs()->exists());
     }
 
     public function test_it_belongs_to_another_contact()
@@ -36,7 +36,7 @@ public function test_it_belongs_to_another_contact()
             'of_contact' => $contact->id,
         ]);
 
-        $this->assertTrue($relationship->withContact()->exists());
+        $this->assertTrue($relationship->ofContact()->exists());
     }
 
     public function test_it_belongs_to_a_relationship_type()
@@ -57,9 +57,9 @@ public function test_it_belongs_to_a_contact_through_with_contact_field()
     {
         $contact = factory('App\Contact')->create([]);
         $relationship = factory('App\Relationship')->create([
-            'contact_id_secondary' => $contact->id,
+            'of_contact' => $contact->id,
         ]);
 
-        $this->assertTrue($relationship->withContact()->exists());
+        $this->assertTrue($relationship->ofContact()->exists());
     }
 }