aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test/plugin_test.rb
diff options
context:
space:
mode:
authorTekin Suleyman <tekin@tekin.co.uk>2009-03-10 15:26:59 +0000
committerTekin Suleyman <tekin@tekin.co.uk>2009-03-10 15:26:59 +0000
commitf1e903aa92f9e4913f3a34135e2dee43bd0cb0c1 (patch)
treebc3ead9f6c1a703649fb06d4c6e83e5e220a8bfe /railties/test/plugin_test.rb
parent7fa0a8d7f38a42d2f41a3f4aefc129d7071b0258 (diff)
parent5739626031b4d938652e5d5b84b20620dcbf6fde (diff)
downloadrails-f1e903aa92f9e4913f3a34135e2dee43bd0cb0c1.tar.gz
rails-f1e903aa92f9e4913f3a34135e2dee43bd0cb0c1.tar.bz2
rails-f1e903aa92f9e4913f3a34135e2dee43bd0cb0c1.zip
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'railties/test/plugin_test.rb')
-rw-r--r--railties/test/plugin_test.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/railties/test/plugin_test.rb b/railties/test/plugin_test.rb
index 5500711df8..a6c390a45a 100644
--- a/railties/test/plugin_test.rb
+++ b/railties/test/plugin_test.rb
@@ -52,11 +52,11 @@ class PluginTest < Test::Unit::TestCase
plugin_for(@valid_plugin_path).load_paths
end
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
plugin_for(@empty_plugin_path).load_paths
end
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
plugin_for('this_is_not_a_plugin_directory').load_paths
end
end
@@ -77,13 +77,13 @@ class PluginTest < Test::Unit::TestCase
end
# This is an empty path so it raises
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
plugin = plugin_for(@empty_plugin_path)
plugin.stubs(:evaluate_init_rb)
plugin.send(:load, @initializer)
end
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
plugin = plugin_for('this_is_not_a_plugin_directory')
plugin.stubs(:evaluate_init_rb)
plugin.send(:load, @initializer)
@@ -97,11 +97,11 @@ class PluginTest < Test::Unit::TestCase
end
# This is an empty path so it raises
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
plugin_for(@empty_plugin_path).load_paths
end
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
plugin_for('this_is_not_a_plugin_directory').load_paths
end
end