From c848baffd2e235902a52d687bebdaa82272c1b6f Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Wed, 16 Sep 2020 09:04:09 +0900 Subject: [PATCH] :scissors: [ci skip] https://github.com/rails/rails/commit/895134bcff294b05d6f6ebb101f60e3083ec5461#diff-7789e18ec0a61c6845755a257e6eb34fR3 https://github.com/rails/rails/commit/ee9e308f686ac1c7b0714671a1dcf1d96de87d70#diff-5e9551294914b338d923032fa904c6beR103 https://github.com/rails/rails/commit/5f63c771f7ce751fefd000470bf4ccab421988d7#diff-600d5368b55e46ed961abb4295977ac3R506 https://github.com/rails/rails/commit/48b6bacbc534d4be3fa89bc19ea83c357a20e598#diff-279ac5c088a3ee7e9f954bbc10d1b773R246 https://github.com/rails/rails/commit/49adb7f4c61de8cbb02c4a207dbd56093d99e795#diff-0cbe7171fdd7821fd5836896849141c0R111 https://github.com/rails/rails/commit/9bfe89e68ee61d9c8ed71ac98c783a7e47bdb608#diff-9c1c95b001e3680ba8a473cf23508b68R8 https://github.com/rails/rails/commit/a0f18e60900fc45eb3524ab3cdfe57be430d6016#diff-bef0ae2c16dacf77bfd2ba099af8a330R47 https://github.com/rails/rails/commit/8b4d344815655027d9f7584c0a59271dce8f1d5a#diff-09660f59aee7ec893ad609315e8843c5R18 https://github.com/rails/rails/commit/49d1b5a98dc50ca59bbfb817f90eb5c2c2645d30#diff-531e71a9d5fdc8181f38ce4416553694R107 https://github.com/rails/rails/commit/b674f04756e2e23fc18308319e4de8ff562575f4#diff-7521c0bb452244663b689e77658e63e3R98 https://github.com/rails/rails/commit/a9012af6883284a35bc5e6166507d429fe10482d#diff-60bdcf1e1954ec56d41fc4c7bd8d3e39R512 https://github.com/rails/rails/commit/6380aee182a6acb4f5062c5aa377d290e696e4b7#diff-5158c234d5e19bb1cffadcbc088400f1R262 https://github.com/rails/rails/commit/c7820d8124c854760a4d288334f185de2fb99446#diff-f4614e7ba8081c0c9e20fe64b6374228R60 https://github.com/rails/rails/commit/8df7ed3b88fc9f19446d7207a745a331893b81cd#diff-0495ed68f82d1bbde593ab5491eab24aR169 https://github.com/rails/rails/commit/6f94260ac67755fbc4d89e7dd9ba6be04abfa9e7#diff-7ecb6672f3fd37dfb79c4539395d3857R28 https://github.com/rails/rails/commit/03e44f93001db97953917e0a100c627e189e2be6#diff-e9234c4c6668852448059c0a35840bcaR185 --- actionpack/lib/action_controller/test_case.rb | 1 - actionpack/lib/action_dispatch/journey/gtg/builder.rb | 1 - actionpack/test/controller/test_case_test.rb | 1 - actionview/lib/action_view/renderer/collection_renderer.rb | 1 - actionview/test/template/asset_tag_helper_test.rb | 1 - actionview/test/template/log_subscriber_test.rb | 1 - actionview/test/template/render_test.rb | 1 - activerecord/lib/active_record/database_configurations.rb | 1 - activerecord/test/cases/query_cache_test.rb | 1 - activerecord/test/cases/relation/where_chain_test.rb | 1 - activesupport/lib/active_support/core_ext/class/attribute.rb | 1 - activesupport/test/json/encoding_test.rb | 1 - railties/lib/rails/test_unit/runner.rb | 1 - railties/test/commands/credentials_test.rb | 1 - railties/test/commands/initializers_test.rb | 1 - railties/test/generators/model_generator_test.rb | 1 - 16 files changed, 16 deletions(-) diff --git a/actionpack/lib/action_controller/test_case.rb b/actionpack/lib/action_controller/test_case.rb index bc7ba87cb1..b3bd75931b 100644 --- a/actionpack/lib/action_controller/test_case.rb +++ b/actionpack/lib/action_controller/test_case.rb @@ -503,7 +503,6 @@ module ActionController process_controller_response(action, cookies, xhr) end - def controller_class_name @controller.class.anonymous? ? "anonymous" : @controller.class.controller_path end diff --git a/actionpack/lib/action_dispatch/journey/gtg/builder.rb b/actionpack/lib/action_dispatch/journey/gtg/builder.rb index cde21fef75..14eb67d093 100644 --- a/actionpack/lib/action_dispatch/journey/gtg/builder.rb +++ b/actionpack/lib/action_dispatch/journey/gtg/builder.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true - require "action_dispatch/journey/gtg/transition_table" module ActionDispatch diff --git a/actionpack/test/controller/test_case_test.rb b/actionpack/test/controller/test_case_test.rb index 2a3afbf449..a9b0434dca 100644 --- a/actionpack/test/controller/test_case_test.rb +++ b/actionpack/test/controller/test_case_test.rb @@ -247,7 +247,6 @@ XML assert_equal JSON.parse(@response.body)["foo"], "bar" end - def test_body_stream params = Hash[:page, { name: "page name" }, "some key", 123] diff --git a/actionview/lib/action_view/renderer/collection_renderer.rb b/actionview/lib/action_view/renderer/collection_renderer.rb index d9c8361d86..ad4d7d2fc6 100644 --- a/actionview/lib/action_view/renderer/collection_renderer.rb +++ b/actionview/lib/action_view/renderer/collection_renderer.rb @@ -106,7 +106,6 @@ module ActionView SameCollectionIterator.new(collection, partial, iter_vars) end - template = find_template(partial, @locals.keys + iter_vars) layout = if !block && (layout = @options[:layout]) diff --git a/actionview/test/template/asset_tag_helper_test.rb b/actionview/test/template/asset_tag_helper_test.rb index a2fc33cba8..831455d728 100644 --- a/actionview/test/template/asset_tag_helper_test.rb +++ b/actionview/test/template/asset_tag_helper_test.rb @@ -509,7 +509,6 @@ class AssetTagHelperTest < ActionView::TestCase assert_dom_equal %(), javascript_include_tag("foo.js") end - def test_should_set_preload_links stylesheet_link_tag("http://example.com/style.css") javascript_include_tag("http://example.com/all.js") diff --git a/actionview/test/template/log_subscriber_test.rb b/actionview/test/template/log_subscriber_test.rb index 439e6f0b8a..15b21c727a 100644 --- a/actionview/test/template/log_subscriber_test.rb +++ b/actionview/test/template/log_subscriber_test.rb @@ -260,7 +260,6 @@ class AVLogSubscriberTest < ActiveSupport::TestCase end end - def test_render_collection_with_implicit_path Rails.stub(:root, File.expand_path(FIXTURE_LOAD_PATH)) do set_cache_controller diff --git a/actionview/test/template/render_test.rb b/actionview/test/template/render_test.rb index 541b0b13b7..445cb9a64a 100644 --- a/actionview/test/template/render_test.rb +++ b/actionview/test/template/render_test.rb @@ -72,7 +72,6 @@ module RenderTestCases assert_equal "Hello world!", @view.render(template: "test/hello_world") end - def test_render_file assert_equal "Hello world!", assert_deprecated { @view.render(file: "test/hello_world") } end diff --git a/activerecord/lib/active_record/database_configurations.rb b/activerecord/lib/active_record/database_configurations.rb index 5fb60758d4..15def05ebc 100644 --- a/activerecord/lib/active_record/database_configurations.rb +++ b/activerecord/lib/active_record/database_configurations.rb @@ -100,7 +100,6 @@ module ActiveRecord first_config && name == first_config.name end - # Returns the DatabaseConfigurations object as a Hash. def to_h configurations.inject({}) do |memo, db_config| diff --git a/activerecord/test/cases/query_cache_test.rb b/activerecord/test/cases/query_cache_test.rb index 46fbeefe80..51db5d8fda 100644 --- a/activerecord/test/cases/query_cache_test.rb +++ b/activerecord/test/cases/query_cache_test.rb @@ -96,7 +96,6 @@ class QueryCacheTest < ActiveRecord::TestCase clean_up_connection_handler end - if Process.respond_to?(:fork) && !in_memory_db? def test_query_cache_with_multiple_handlers_and_forked_processes ActiveRecord::Base.connection_handlers = { diff --git a/activerecord/test/cases/relation/where_chain_test.rb b/activerecord/test/cases/relation/where_chain_test.rb index 94bc06362d..8cec633b39 100644 --- a/activerecord/test/cases/relation/where_chain_test.rb +++ b/activerecord/test/cases/relation/where_chain_test.rb @@ -8,7 +8,6 @@ require "models/essay" require "models/comment" require "models/categorization" - module ActiveRecord class WhereChainTest < ActiveRecord::TestCase fixtures :posts, :comments, :authors, :humans, :essays diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index a41b19b60e..ec78845159 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -102,7 +102,6 @@ class Class end RUBY - class_methods << <<~RUBY silence_redefinition_of_method def #{name}=(value) redefine_method(:#{name}) { value } if singleton_class? diff --git a/activesupport/test/json/encoding_test.rb b/activesupport/test/json/encoding_test.rb index 30a3b8e5a0..aac572aa87 100644 --- a/activesupport/test/json/encoding_test.rb +++ b/activesupport/test/json/encoding_test.rb @@ -164,7 +164,6 @@ class TestJSONEncoding < ActiveSupport::TestCase assert_equal({ "foo" => { "foo" => "hello" } }, JSON.parse(json)) end - def test_hash_should_pass_encoding_options_to_children_in_as_json person = { name: "John", diff --git a/railties/lib/rails/test_unit/runner.rb b/railties/lib/rails/test_unit/runner.rb index e46dac2f3e..f5da146711 100644 --- a/railties/lib/rails/test_unit/runner.rb +++ b/railties/lib/rails/test_unit/runner.rb @@ -44,7 +44,6 @@ module Rails def load_tests(argv) patterns = extract_filters(argv) - tests = Rake::FileList[patterns.any? ? patterns : default_test_glob] tests.exclude(default_test_exclude_glob) if patterns.empty? diff --git a/railties/test/commands/credentials_test.rb b/railties/test/commands/credentials_test.rb index 974b34836b..51e1c94709 100644 --- a/railties/test/commands/credentials_test.rb +++ b/railties/test/commands/credentials_test.rb @@ -178,7 +178,6 @@ class Rails::Command::CredentialsCommandTest < ActiveSupport::TestCase assert_match(encrypted_content, run_diff_command(content_path)) end - private def run_edit_command(editor: "cat", environment: nil, **options) switch_env("EDITOR", editor) do diff --git a/railties/test/commands/initializers_test.rb b/railties/test/commands/initializers_test.rb index 793365ef3d..277e8028d2 100644 --- a/railties/test/commands/initializers_test.rb +++ b/railties/test/commands/initializers_test.rb @@ -25,7 +25,6 @@ class Rails::Command::InitializersTest < ActiveSupport::TestCase assert final_output.include?("set_added_test_module") end - test "prints out initializers only specified in environment option" do add_to_config <<-RUBY initializer(:set_added_development_module) { } if Rails.env.development? diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb index bd07fb86ff..7d9f9fe7bc 100644 --- a/railties/test/generators/model_generator_test.rb +++ b/railties/test/generators/model_generator_test.rb @@ -15,7 +15,6 @@ class ModelGeneratorTest < Rails::Generators::TestCase Rails.application.config.active_record.belongs_to_required_by_default = true end - def teardown Rails.application.config.active_record.belongs_to_required_by_default = @old_belongs_to_required_by_default end