[12.x] Fix trial ends at check

src/Concerns/ManagesSubscriptions.php

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

tests/Feature/SubscriptionsTest.php

@@ -10,6 +10,7 @@
 use Laravel\Cashier\Exceptions\PaymentFailure;
 use Laravel\Cashier\Payment;
 use Laravel\Cashier\Subscription;
+use Laravel\Cashier\Tests\Fixtures\User;
 use Stripe\Coupon;
 use Stripe\Invoice;
 use Stripe\Plan;
@@ -468,6 +469,15 @@ public function test_creating_subscription_with_trial()
         $this->assertEquals(Carbon::today()->addDays(7)->day, $subscription->trial_ends_at->day);
     }
 
+    public function test_user_without_subscriptions_can_return_its_generic_trial_end_date()
+    {
+        $user = new User;
+        $user->trial_ends_at = $tomorrow = Carbon::tomorrow();
+
+        $this->assertTrue($user->onGenericTrial());
+        $this->assertSame($tomorrow, $user->trialEndsAt());
+    }
+
     public function test_creating_subscription_with_explicit_trial()
     {
         $user = $this->createCustomer('creating_subscription_with_explicit_trial');

tests/Unit/CustomerTest.php

@@ -19,7 +19,6 @@ public function test_customer_can_be_put_on_a_generic_trial()
         $user->trial_ends_at = $tomorrow = Carbon::tomorrow();
 
         $this->assertTrue($user->onGenericTrial());
-        $this->assertSame($tomorrow, $user->trialEndsAt());
 
         $user->trial_ends_at = Carbon::today()->subDays(5);