Fix subscription active scope with ended trial. Closes pay-rails#940 C…

…loses pay-rails#939

app/models/pay/subscription.rb

@@ -9,11 +9,11 @@ class Subscription < Pay::ApplicationRecord
 
     # Scopes
     scope :for_name, ->(name) { where(name: name) }
-    scope :on_trial, -> { where("trial_ends_at > ?", Time.current) }
+    scope :on_trial, -> { where(status: ["trialing", "active"]).where("trial_ends_at > ?", Time.current) }
     scope :canceled, -> { where.not(ends_at: nil) }
     scope :cancelled, -> { canceled }
     scope :on_grace_period, -> { where("#{table_name}.ends_at IS NOT NULL AND #{table_name}.ends_at > ?", Time.current) }
-    scope :active, -> { where(status: ["trialing", "active"]).pause_not_started.where("#{table_name}.ends_at IS NULL OR #{table_name}.ends_at > ?", Time.current).where("trial_ends_at IS NULL OR trial_ends_at > ?", Time.current) }
+    scope :active, -> { where(status: "active").pause_not_started.where("#{table_name}.ends_at IS NULL OR #{table_name}.ends_at > ?", Time.current).or(on_trial) }
     scope :paused, -> { where(status: "paused").or(where("pause_starts_at <= ?", Time.current)) }
     scope :pause_not_started, -> { where("pause_starts_at IS NULL OR pause_starts_at > ?", Time.current) }
     scope :active_or_paused, -> { active.or(paused) }

test/models/pay/subscription_test.rb

@@ -124,6 +124,12 @@ class Pay::Subscription::Test < ActiveSupport::TestCase
     assert_includes subscriptions, trialing_subscription
   end
 
+  test "active scope should include previously trialed subscriptions" do
+    trialing_subscription = create_subscription(trial_ends_at: 7.days.ago)
+    subscriptions = Pay::Subscription.active
+    assert_includes subscriptions, trialing_subscription
+  end
+
   test "active scope should not include paused subscriptions" do
     paused_subscription = create_subscription(status: "paused")
     subscriptions = Pay::Subscription.active