Merge pull request #11300 from arunagw/railties-engine-deprecation-removed

Removed deprecated `Rails.application.railties.engines`.
This commit is contained in:
José Valim 2013-07-04 10:59:30 -07:00
commit f06fdf5b97
3 changed files with 4 additions and 12 deletions

@ -1,3 +1,7 @@
* Removed deprecated `Rails.application.railties.engines`.
*Arun Agrawal*
* Removed deprecated threadsafe! from Rails Config.
*Paul Nikitochkin*

@ -9,10 +9,6 @@ def initialize
::Rails::Engine.subclasses.map(&:instance)
end
def self.engines
@engines ||= ::Rails::Engine.subclasses.map(&:instance)
end
def each(*args, &block)
_all.each(*args, &block)
end
@ -25,5 +21,3 @@ def -(others)
end
end
end
ActiveSupport::Deprecation.deprecate_methods(Rails::Engine::Railties, :engines)

@ -1236,12 +1236,6 @@ def index
assert_equal '/foo/bukkits/bukkit', last_response.body
end
test "engines method is properly deprecated" do
boot_rails
assert_deprecated { app.railties.engines }
end
private
def app
Rails.application