aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/dispatch/header_test.rb
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2018-07-27 09:05:41 +0900
committerGitHub <noreply@github.com>2018-07-27 09:05:41 +0900
commitb4d91bb41f9cc555d80d0cb6b0a41179d26fa252 (patch)
treedb235b3475096508d6400010b08ada428968ce2d /actionpack/test/dispatch/header_test.rb
parente03add224899e0a10e7cfa28c09e68c8b9c920ed (diff)
parent1933fbaecf5efa982c4214fed51d88d120ffe236 (diff)
downloadrails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.tar.gz
rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.tar.bz2
rails-b4d91bb41f9cc555d80d0cb6b0a41179d26fa252.zip
Merge pull request #33441 from bogdanvlviv/remove-rubocop-comments-from-codebase
Remove Rubocop's comments from Rails code base
Diffstat (limited to 'actionpack/test/dispatch/header_test.rb')
-rw-r--r--actionpack/test/dispatch/header_test.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/actionpack/test/dispatch/header_test.rb b/actionpack/test/dispatch/header_test.rb
index 43e63eb996..bd2a5b35fb 100644
--- a/actionpack/test/dispatch/header_test.rb
+++ b/actionpack/test/dispatch/header_test.rb
@@ -105,20 +105,16 @@ class HeaderTest < ActiveSupport::TestCase
end
test "#merge! headers with mutation" do
- # rubocop:disable Performance/RedundantMerge
@headers.merge!("Host" => "http://example.test",
"Content-Type" => "text/html")
- # rubocop:enable Performance/RedundantMerge
assert_equal({ "HTTP_HOST" => "http://example.test",
"CONTENT_TYPE" => "text/html",
"HTTP_REFERER" => "/some/page" }, @headers.env)
end
test "#merge! env with mutation" do
- # rubocop:disable Performance/RedundantMerge
@headers.merge!("HTTP_HOST" => "http://first.com",
"CONTENT_TYPE" => "text/html")
- # rubocop:enable Performance/RedundantMerge
assert_equal({ "HTTP_HOST" => "http://first.com",
"CONTENT_TYPE" => "text/html",
"HTTP_REFERER" => "/some/page" }, @headers.env)