aboutsummaryrefslogtreecommitdiffstats
path: root/railties/test
diff options
context:
space:
mode:
Diffstat (limited to 'railties/test')
-rw-r--r--railties/test/initializer_test.rb2
-rw-r--r--railties/test/plugin_locator_test.rb2
-rw-r--r--railties/test/plugin_test.rb12
3 files changed, 8 insertions, 8 deletions
diff --git a/railties/test/initializer_test.rb b/railties/test/initializer_test.rb
index e91e05d939..561f7b8b54 100644
--- a/railties/test/initializer_test.rb
+++ b/railties/test/initializer_test.rb
@@ -237,7 +237,7 @@ class InitializerPluginLoadingTests < Test::Unit::TestCase
def test_registering_a_plugin_name_that_does_not_exist_raises_a_load_error
only_load_the_following_plugins! [:stubby, :acts_as_a_non_existant_plugin]
- assert_raises(LoadError) do
+ assert_raise(LoadError) do
load_plugins!
end
end
diff --git a/railties/test/plugin_locator_test.rb b/railties/test/plugin_locator_test.rb
index c8404e126e..471d9fc7c3 100644
--- a/railties/test/plugin_locator_test.rb
+++ b/railties/test/plugin_locator_test.rb
@@ -2,7 +2,7 @@ require 'plugin_test_helper'
class PluginLocatorTest < Test::Unit::TestCase
def test_should_require_subclasses_to_implement_the_plugins_method
- assert_raises(RuntimeError) do
+ assert_raise(RuntimeError) do
Rails::Plugin::Locator.new(nil).plugins
end
end
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