From 771973c13dd5b68fe96fbe5ea96bd11656437dc1 Mon Sep 17 00:00:00 2001 From: Sharang Dashputre Date: Mon, 1 Apr 2019 17:59:37 +0530 Subject: url -> URL where apt except inside actionpack/ --- .../app/controllers/active_storage/disk_controller.rb | 2 +- activestorage/test/models/blob_test.rb | 10 +++++----- activestorage/test/service/disk_service_test.rb | 2 +- activestorage/test/template/image_tag_test.rb | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'activestorage') diff --git a/activestorage/app/controllers/active_storage/disk_controller.rb b/activestorage/app/controllers/active_storage/disk_controller.rb index df8d73cc91..df3116afd7 100644 --- a/activestorage/app/controllers/active_storage/disk_controller.rb +++ b/activestorage/app/controllers/active_storage/disk_controller.rb @@ -3,7 +3,7 @@ # Serves files stored with the disk service in the same way that the cloud services do. # This means using expiring, signed URLs that are meant for immediate access, not permanent linking. # Always go through the BlobsController, or your own authenticated controller, rather than directly -# to the service url. +# to the service URL. class ActiveStorage::DiskController < ActiveStorage::BaseController skip_forgery_protection diff --git a/activestorage/test/models/blob_test.rb b/activestorage/test/models/blob_test.rb index b7b37bacf5..9fd75a1b4a 100644 --- a/activestorage/test/models/blob_test.rb +++ b/activestorage/test/models/blob_test.rb @@ -114,7 +114,7 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase end end - test "urls expiring in 5 minutes" do + test "URLs expiring in 5 minutes" do blob = create_blob freeze_time do @@ -123,7 +123,7 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase end end - test "urls force content_type to binary and attachment as content disposition for content types served as binary" do + test "URLs force content_type to binary and attachment as content disposition for content types served as binary" do blob = create_blob(content_type: "text/html") freeze_time do @@ -132,7 +132,7 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase end end - test "urls force attachment as content disposition when the content type is not allowed inline" do + test "URLs force attachment as content disposition when the content type is not allowed inline" do blob = create_blob(content_type: "application/zip") freeze_time do @@ -141,7 +141,7 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase end end - test "urls allow for custom filename" do + test "URLs allow for custom filename" do blob = create_blob(filename: "original.txt") new_filename = ActiveStorage::Filename.new("new.txt") @@ -153,7 +153,7 @@ class ActiveStorage::BlobTest < ActiveSupport::TestCase end end - test "urls allow for custom options" do + test "URLs allow for custom options" do blob = create_blob(filename: "original.txt") arguments = [ diff --git a/activestorage/test/service/disk_service_test.rb b/activestorage/test/service/disk_service_test.rb index a0218bff1c..f3c4dd26bd 100644 --- a/activestorage/test/service/disk_service_test.rb +++ b/activestorage/test/service/disk_service_test.rb @@ -7,7 +7,7 @@ class ActiveStorage::Service::DiskServiceTest < ActiveSupport::TestCase include ActiveStorage::Service::SharedServiceTests - test "url generation" do + test "URL generation" do assert_match(/^https:\/\/example.com\/rails\/active_storage\/disk\/.*\/avatar\.png\?content_type=image%2Fpng&disposition=inline/, @service.url(@key, expires_in: 5.minutes, disposition: :inline, filename: ActiveStorage::Filename.new("avatar.png"), content_type: "image/png")) end diff --git a/activestorage/test/template/image_tag_test.rb b/activestorage/test/template/image_tag_test.rb index f0b166c225..258cf702ad 100644 --- a/activestorage/test/template/image_tag_test.rb +++ b/activestorage/test/template/image_tag_test.rb @@ -37,7 +37,7 @@ class ActiveStorage::ImageTagTest < ActionView::TestCase assert_raises(ArgumentError) { image_tag(@user.avatar) } end - test "error when object can't be resolved into url" do + test "error when object can't be resolved into URL" do unresolvable_object = ActionView::Helpers::AssetTagHelper assert_raises(ArgumentError) { image_tag(unresolvable_object) } end -- cgit v1.2.3