3 files changed, 22 insertions, 4 deletions
diff --git a/test/blob_test.rb b/test/blob_test.rb
index 88b513c946..ac54e0f2ca 100644
--- a/test/blob_test.rb
+++ b/test/blob_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "database/setup"
 require "active_file/blob"
 
-ActiveFile::Blob.site = ActiveFile::Sites::DiskSite.new(root: File.join(Dir.tmpdir, "active_file"))
-
 class ActiveFile::BlobTest < ActiveSupport::TestCase
   test "create after upload sets byte size and checksum" do
     data = "Hello world!"
@@ -14,9 +12,12 @@ class ActiveFile::BlobTest < ActiveSupport::TestCase
     assert_equal Digest::MD5.hexdigest(data), blob.checksum
   end
 
-  test "url" do
+  test "url expiring in 5 minutes" do
     blob = create_blob
-    assert_equal "/rails/blobs/#{blob.key}", blob.url
+
+    travel_to Time.now do
+      assert_equal "/rails/blobs/#{ActiveFile::VerifiedKeyWithExpiration.encode(blob.key, expires_in: 5.minutes)}", blob.url
+    end
   end
 
   private
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 0964774e00..5be2631ceb 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -4,3 +4,9 @@ require "active_support/testing/autorun"
 require "byebug"
 
 require "active_file"
+
+require "active_file/site"
+ActiveFile::Blob.site = ActiveFile::Sites::DiskSite.new(root: File.join(Dir.tmpdir, "active_file"))
+
+require "active_file/verified_key_with_expiration"
+ActiveFile::VerifiedKeyWithExpiration.verifier = ActiveSupport::MessageVerifier.new("Testing")
diff --git a/test/verified_key_with_expiration_test.rb b/test/verified_key_with_expiration_test.rb
new file mode 100644
index 0000000000..ac605a95e9
--- /dev/null
+++ b/test/verified_key_with_expiration_test.rb
@@ -0,0 +1,11 @@
+require "test_helper"
+require "active_support/core_ext/securerandom"
+
+class ActiveFile::VerifiedKeyWithExpirationTest < ActiveSupport::TestCase
+  FIXTURE_KEY = SecureRandom.base58(24)
+
+  test "without expiration" do
+    encoded_key = ActiveFile::VerifiedKeyWithExpiration.encode(FIXTURE_KEY)
+    assert_equal FIXTURE_KEY, ActiveFile::VerifiedKeyWithExpiration.decode(encoded_key)
+  end
+end