Merge pull request #3866 from AlchemyCMS/fix-publishable-uses-preview-time

fix(TimestampResolver): Use Time.current in publishable?

Author: tvdeyen

app/models/alchemy/publishable/timestamp_resolver.rb

@@ -52,7 +52,7 @@ def scheduled?(at: Current.preview_time)
       # A record is publishable if a +public_on+ timestamp is set and not
       # expired yet.
       def publishable?
-        !publishable.public_on.nil? && still_public_for?
+        !publishable.public_on.nil? && still_public_for?(at: Time.current)
       end
 
       private

spec/models/alchemy/publishable/timestamp_resolver_spec.rb

@@ -159,5 +159,15 @@
 
       it { expect(resolver.publishable?).to be(false) }
     end
+
+    context "when Current.preview_time is set to a future time" do
+      let(:public_on) { Time.current - 1.day }
+      let(:public_until) { Time.current + 1.day }
+
+      it "uses Time.current instead of the preview_time" do
+        Alchemy::Current.preview_time = Time.current + 1.week
+        expect(resolver.publishable?).to be(true)
+      end
+    end
   end
 end