From 3b9f5e3f4bfb41cc9288cb6e9319acf6f386cc01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rodrigo=20Ram=C3=ADrez=20Norambuena?= Date: Tue, 29 Sep 2020 16:49:17 -0300 Subject: [PATCH] Remove add_gem_entry_filter from GeneratorAppBase: The add_gem_entry_filter was introduce in f7e0758714e645865361b5566253d3e7d896beff and doesn't work this feature --- railties/lib/rails/generators/app_base.rb | 6 ------ railties/test/generators/generator_test.rb | 24 ---------------------- 2 files changed, 30 deletions(-) diff --git a/railties/lib/rails/generators/app_base.rb b/railties/lib/rails/generators/app_base.rb index e04bff9d32..4b18a50204 100644 --- a/railties/lib/rails/generators/app_base.rb +++ b/railties/lib/rails/generators/app_base.rb @@ -122,12 +122,6 @@ module Rails cable_gemfile_entry].flatten.find_all(&@gem_filter) end - def add_gem_entry_filter # :doc: - @gem_filter = lambda { |next_filter, entry| - yield(entry) && next_filter.call(entry) - }.curry[@gem_filter] - end - def builder # :doc: @builder ||= begin builder_class = get_builder_class diff --git a/railties/test/generators/generator_test.rb b/railties/test/generators/generator_test.rb index fcdb1cfaa6..281d5a5572 100644 --- a/railties/test/generators/generator_test.rb +++ b/railties/test/generators/generator_test.rb @@ -15,7 +15,6 @@ module Rails include(Module.new { def gemfile_entries; super; end def invoke_all; super; self; end - def add_gem_entry_filter; super; end }) end end @@ -25,29 +24,6 @@ module Rails assert klass.start(["new", "blah"]) end - def test_filter - klass = make_builder_class - generator = klass.start(["new", "blah"]) - gems = generator.gemfile_entries - generator.add_gem_entry_filter { |gem| - gem.name != gems.first.name - } - assert_equal gems.drop(1), generator.gemfile_entries - end - - def test_two_filters - klass = make_builder_class - generator = klass.start(["new", "blah"]) - gems = generator.gemfile_entries - generator.add_gem_entry_filter { |gem| - gem.name != gems.first.name - } - generator.add_gem_entry_filter { |gem| - gem.name != gems[1].name - } - assert_equal gems.drop(2), generator.gemfile_entries - end - def test_recommended_rails_versions klass = make_builder_class generator = klass.start(["new", "blah"])