Skip to content

Commit 16c537e

Browse files
authored
Merge pull request rails#43705 from gmcgibbon/fixes_for_43294
Fix metadata assertions in direct upload tests
2 parents 05ec88c + 896e747 commit 16c537e

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

activestorage/test/controllers/direct_uploads_controller_test.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class ActiveStorage::S3DirectUploadsControllerTest < ActionDispatch::Integration
2323
"my_key_2": "my_value_2",
2424
"platform": "my_platform",
2525
"library_ID": "12345",
26-
custom: {
26+
"custom": {
2727
"my_key_3": "my_value_3"
2828
}
2929
}
@@ -38,7 +38,7 @@ class ActiveStorage::S3DirectUploadsControllerTest < ActionDispatch::Integration
3838
assert_equal "hello.txt", details["filename"]
3939
assert_equal 6, details["byte_size"]
4040
assert_equal checksum, details["checksum"]
41-
assert_equal metadata, details["metadata"].transform_keys(&:to_sym)
41+
assert_equal metadata, details["metadata"].deep_transform_keys(&:to_sym)
4242
assert_equal "text/plain", details["content_type"]
4343
assert_match SERVICE_CONFIGURATIONS[:s3][:bucket], details["direct_upload"]["url"]
4444
assert_match(/s3(-[-a-z0-9]+)?\.(\S+)?amazonaws\.com/, details["direct_upload"]["url"])
@@ -71,7 +71,7 @@ class ActiveStorage::GCSDirectUploadsControllerTest < ActionDispatch::Integratio
7171
"my_key_2": "my_value_2",
7272
"platform": "my_platform",
7373
"library_ID": "12345",
74-
custom: {
74+
"custom": {
7575
"my_key_3": "my_value_3"
7676
}
7777
}
@@ -86,7 +86,7 @@ class ActiveStorage::GCSDirectUploadsControllerTest < ActionDispatch::Integratio
8686
assert_equal "hello.txt", details["filename"]
8787
assert_equal 6, details["byte_size"]
8888
assert_equal checksum, details["checksum"]
89-
assert_equal metadata, details["metadata"].transform_keys(&:to_sym)
89+
assert_equal metadata, details["metadata"].deep_transform_keys(&:to_sym)
9090
assert_equal "text/plain", details["content_type"]
9191
assert_match %r{storage\.googleapis\.com/#{@config[:bucket]}}, details["direct_upload"]["url"]
9292
assert_equal({ "Content-MD5" => checksum, "Content-Disposition" => "inline; filename=\"hello.txt\"; filename*=UTF-8''hello.txt", "x-goog-meta-my_key_3" => "my_value_3" }, details["direct_upload"]["headers"])
@@ -130,7 +130,7 @@ class ActiveStorage::AzureStorageDirectUploadsControllerTest < ActionDispatch::I
130130
assert_equal "hello.txt", details["filename"]
131131
assert_equal 6, details["byte_size"]
132132
assert_equal checksum, details["checksum"]
133-
assert_equal metadata, details["metadata"].transform_keys(&:to_sym)
133+
assert_equal metadata, details["metadata"].deep_transform_keys(&:to_sym)
134134
assert_equal "text/plain", details["content_type"]
135135
assert_match %r{#{@config[:storage_account_name]}\.blob\.core\.windows\.net/#{@config[:container]}}, details["direct_upload"]["url"]
136136
assert_equal({ "Content-Type" => "text/plain", "Content-MD5" => checksum, "x-ms-blob-content-disposition" => "inline; filename=\"hello.txt\"; filename*=UTF-8''hello.txt", "x-ms-blob-type" => "BlockBlob" }, details["direct_upload"]["headers"])
@@ -162,7 +162,7 @@ class ActiveStorage::DiskDirectUploadsControllerTest < ActionDispatch::Integrati
162162
assert_equal "hello.txt", details["filename"]
163163
assert_equal 6, details["byte_size"]
164164
assert_equal checksum, details["checksum"]
165-
assert_equal metadata, details["metadata"].transform_keys(&:to_sym)
165+
assert_equal metadata, details["metadata"].deep_transform_keys(&:to_sym)
166166
assert_equal "text/plain", details["content_type"]
167167
assert_match(/rails\/active_storage\/disk/, details["direct_upload"]["url"])
168168
assert_equal({ "Content-Type" => "text/plain" }, details["direct_upload"]["headers"])
@@ -212,7 +212,7 @@ class ActiveStorage::DiskDirectUploadsControllerTest < ActionDispatch::Integrati
212212
assert_equal "hello.txt", details["filename"]
213213
assert_equal 6, details["byte_size"]
214214
assert_equal checksum, details["checksum"]
215-
assert_equal metadata, details["metadata"].transform_keys(&:to_sym)
215+
assert_equal metadata, details["metadata"].deep_transform_keys(&:to_sym)
216216
assert_equal "text/plain", details["content_type"]
217217
assert_match(/rails\/active_storage\/disk/, details["direct_upload"]["url"])
218218
assert_equal({ "Content-Type" => "text/plain" }, details["direct_upload"]["headers"])

0 commit comments

Comments
 (0)