From 09ec075f1ee52f6bb2be83df1336e6d4924b3e9c Mon Sep 17 00:00:00 2001 From: bogdanvlviv Date: Thu, 26 Jul 2018 11:33:49 +0300 Subject: Remove Rubocop's comments from Rails code base PR#32381 added Rubocop's comments to some tests files in order to exclude `Performance/RedundantMerge`. Turn off `Performance` cops for tests files via `Exclude` in `.rubocop.yml`. Context https://github.com/rails/rails/pull/32381#discussion_r205212331 --- actionpack/test/dispatch/header_test.rb | 4 ---- 1 file changed, 4 deletions(-) (limited to 'actionpack/test') 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) -- cgit v1.2.3