aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2017-02-24 19:00:19 -0500
committerGitHub <noreply@github.com>2017-02-24 19:00:19 -0500
commit389c61780d3e9d7717b8eae11c4981de985681b2 (patch)
treee989ba88823b4011a35ff11687c05eecd18b638d /actionpack/test
parent87b2b6c5124732ff709b8e1900a99ba0a08f6982 (diff)
parent29c02709cd68a122c5db4f58ec0e901fe3d507cc (diff)
downloadrails-389c61780d3e9d7717b8eae11c4981de985681b2.tar.gz
rails-389c61780d3e9d7717b8eae11c4981de985681b2.tar.bz2
rails-389c61780d3e9d7717b8eae11c4981de985681b2.zip
Merge pull request #28158 from dylanahsmith/gzip-crc-check
Add missing gzip footer check in ActiveSupport::Gzip.decompress
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/dispatch/static_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index bd8318f5f6..3082d1072b 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -224,7 +224,7 @@ module StaticTests
def assert_gzip(file_name, response)
expected = File.read("#{FIXTURE_LOAD_PATH}/#{public_path}" + file_name)
- actual = Zlib::GzipReader.new(StringIO.new(response.body)).read
+ actual = ActiveSupport::Gzip.decompress(response.body)
assert_equal expected, actual
end