aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2009-12-30 19:33:32 -0800
committerJeremy Kemper <jeremy@bitsweat.net>2009-12-30 19:34:15 -0800
commit1fbd02e44618f1f56e1d9d0af85c6a4108a66532 (patch)
tree53c426130333053cf40e51b8bc00174876ecccc4 /railties/test
parent10a2638db099baddfa46da98f780df3a72a718d4 (diff)
downloadrails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.tar.gz
rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.tar.bz2
rails-1fbd02e44618f1f56e1d9d0af85c6a4108a66532.zip
Revert "Add config.action_controller.include behavior to plugins."
This reverts commit 7e8b7f46bfc086a36db996420fbee93348c5268e. Conflicts: railties/lib/rails/plugin.rb
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/plugins/configuration_test.rb16
1 files changed, 0 insertions, 16 deletions
diff --git a/railties/test/plugins/configuration_test.rb b/railties/test/plugins/configuration_test.rb
index 0843d05577..5786316d1d 100644
--- a/railties/test/plugins/configuration_test.rb
+++ b/railties/test/plugins/configuration_test.rb
@@ -8,10 +8,6 @@ module PluginsTest
require "rails"
end
- module Bar; end
- module Baz; end
- module All; end
-
test "config is available to plugins" do
class Foo < Rails::Plugin ; end
assert_nil Foo.config.action_controller.foo
@@ -28,18 +24,6 @@ module PluginsTest
assert_equal "hello", AppTemplate::Application.config.foo.greetings
end
- test "plugin configurations allow modules to be given" do
- class Foo < Rails::Plugin ; config.foo.include(Bar, Baz) ; end
- assert_equal [Bar, Baz], Foo.config.foo.includes
- end
-
- test "plugin includes given modules in given class" do
- class Foo < Rails::Plugin ; config.foo.include(Bar, "PluginsTest::ConfigurationTest::Baz") ; include_modules_in All ; end
- Foo.new.run_initializers(Foo)
- assert All.ancestors.include?(Bar)
- assert All.ancestors.include?(Baz)
- end
-
test "plugin config merges are deep" do
class Foo < Rails::Plugin ; config.foo.greetings = 'hello' ; end
class MyApp < Rails::Application