[1.x] Fix trial ends at (#87)

* Add missing test

* Fixed bug

* suggested changes

Author: yoeriboven

src/Concerns/ManagesSubscriptions.php

@@ -84,11 +84,11 @@ public function onGenericTrial()
      */
     public function trialEndsAt($name = 'default')
     {
-        if ($this->onGenericTrial()) {
-            return $this->customer->trial_ends_at;
+        if ($subscription = $this->subscription($name)) {
+            return $subscription->trial_ends_at;
         }
 
-        return $this->subscription($name)->trial_ends_at;
+        return $this->customer->trial_ends_at;
     }
 
     /**

tests/Feature/CustomerTest.php

@@ -11,6 +11,7 @@ public function test_billable_models_can_create_a_customer_record()
         $customer = $user->createAsCustomer(['trial_ends_at' => $trialEndsAt = now()->addDays(15)]);
 
         $this->assertSame($trialEndsAt->timestamp, $customer->trial_ends_at->timestamp);
+        $this->assertSame($trialEndsAt->timestamp, $user->trialEndsAt()->timestamp);
         $this->assertTrue($user->onGenericTrial());
     }
 
@@ -27,4 +28,12 @@ public function test_billable_models_without_having_a_customer_record_can_still_
         $this->assertEmpty($user->receipts);
         $this->assertNull($user->subscription());
     }
+
+    public function test_trial_ends_at_works_if_generic_trial_is_expired()
+    {
+        $user = $this->createUser();
+        $user->createAsCustomer(['trial_ends_at' => $trialEndsAt = now()->subDays(15)]);
+
+        $this->assertSame($trialEndsAt->timestamp, $user->trialEndsAt()->timestamp);
+    }
 }