aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeorge Claghorn <george@basecamp.com>2017-07-19 13:58:23 -0400
committerGeorge Claghorn <george@basecamp.com>2017-07-19 13:58:23 -0400
commitd0d4e33b86369e4b7c5656dd5db60e04f8c4d76e (patch)
treee9a695b7982457cae86b3a16b95ce93ae03dd644
parentc8ad7dc13bbdc7b5c3305d5fd0a93f47d0f4baa4 (diff)
downloadrails-d0d4e33b86369e4b7c5656dd5db60e04f8c4d76e.tar.gz
rails-d0d4e33b86369e4b7c5656dd5db60e04f8c4d76e.tar.bz2
rails-d0d4e33b86369e4b7c5656dd5db60e04f8c4d76e.zip
Use descriptive new freeze_time helper
-rw-r--r--Gemfile.lock2
-rw-r--r--test/blob_test.rb2
-rw-r--r--test/service/gcs_service_test.rb2
-rw-r--r--test/service/mirror_service_test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index eb8c229a41..5b283272f7 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,6 @@
GIT
remote: https://github.com/rails/rails.git
- revision: c1f9fa8c69590222fac43d58bf64ef4a1225d7ce
+ revision: 5c16dd35a23f75038baf1527143ee44accf081ff
specs:
actionpack (5.2.0.alpha)
actionview (= 5.2.0.alpha)
diff --git a/test/blob_test.rb b/test/blob_test.rb
index 6a9765a859..ddc000ed51 100644
--- a/test/blob_test.rb
+++ b/test/blob_test.rb
@@ -28,7 +28,7 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase
test "urls expiring in 5 minutes" do
blob = create_blob
- travel_to Time.now do
+ freeze_time do
assert_equal expected_url_for(blob), blob.url
assert_equal expected_url_for(blob, disposition: :attachment), blob.url(disposition: :attachment)
end
diff --git a/test/service/gcs_service_test.rb b/test/service/gcs_service_test.rb
index 3d70080af4..4cde4b9289 100644
--- a/test/service/gcs_service_test.rb
+++ b/test/service/gcs_service_test.rb
@@ -27,7 +27,7 @@ if SERVICE_CONFIGURATIONS[:gcs]
end
test "signed URL generation" do
- travel_to Time.now do
+ freeze_time do
url = SERVICE.bucket.signed_url(FIXTURE_KEY, expires: 120) +
"&response-content-disposition=inline%3B+filename%3D%22test.txt%22"
diff --git a/test/service/mirror_service_test.rb b/test/service/mirror_service_test.rb
index 3639f83d38..fd3d8125d6 100644
--- a/test/service/mirror_service_test.rb
+++ b/test/service/mirror_service_test.rb
@@ -45,7 +45,7 @@ class ActiveStorage::Service::MirrorServiceTest < ActiveSupport::TestCase
end
test "URL generation in primary service" do
- travel_to Time.now do
+ freeze_time do
assert_equal SERVICE.primary.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt"),
@service.url(FIXTURE_KEY, expires_in: 2.minutes, disposition: :inline, filename: "test.txt")
end