Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.

[#1617 state:resolved]

1 files changed, 27 insertions, 27 deletions

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index 55f3ad23be..8ed6b471ae 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -219,7 +219,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
     a_value = nil
 
     # Local jump because of return inside eval.
-    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+    assert_raise(LocalJumpError) { eval(segment.extraction_code) }
   end
 
   def test_extraction_code_should_return_on_mismatch
@@ -229,7 +229,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
     a_value = nil
 
     # Local jump because of return inside eval.
-    assert_raises(LocalJumpError) { eval(segment.extraction_code) }
+    assert_raise(LocalJumpError) { eval(segment.extraction_code) }
   end
 
   def test_extraction_code_should_accept_value_and_set_local
@@ -494,7 +494,7 @@ class RouteBuilderTest < Test::Unit::TestCase
     defaults = {:action => 'buy', :person => nil, :car => nil}
     requirements = {:person => /\w+/, :car => /^\w+$/}
 
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       route_requirements = builder.assign_route_options(segments, defaults, requirements)
     end
 
@@ -882,7 +882,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     end
     assert_equal({:controller => "admin/accounts", :action => "index"}, rs.recognize_path("/admin/accounts"))
     assert_equal({:controller => "admin/users", :action => "index"}, rs.recognize_path("/admin/users"))
-    assert_raises(ActionController::RoutingError) { rs.recognize_path("/admin/products") }
+    assert_raise(ActionController::RoutingError) { rs.recognize_path("/admin/products") }
   end
 
   def test_route_with_regexp_and_dot
@@ -1060,11 +1060,11 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     rs.draw do |map|
       map.connect ':controller/:action/:id'
     end
-    assert_raises(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
+    assert_raise(ActionController::RoutingError) { rs.recognize_path("/not_a/show/10") }
   end
 
   def test_paths_do_not_accept_defaults
-    assert_raises(ActionController::RoutingError) do
+    assert_raise(ActionController::RoutingError) do
       rs.draw do |map|
         map.path 'file/*path', :controller => 'content', :action => 'show_file', :path => %w(fake default)
         map.connect ':controller/:action/:id'
@@ -1197,7 +1197,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
 
     assert_equal '/post/10', rs.generate(:controller => 'post', :action => 'show', :id => 10)
 
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       rs.generate(:controller => 'post', :action => 'show')
     end
   end
@@ -1407,7 +1407,7 @@ class LegacyRouteSetTests < Test::Unit::TestCase
     end
 
     x = setup_for_named_route
-    assert_raises(ActionController::RoutingError) do
+    assert_raise(ActionController::RoutingError) do
       x.send(:foo_with_requirement_url, "I am Against the requirements")
     end
   end
@@ -1539,7 +1539,7 @@ class RouteTest < Test::Unit::TestCase
   end
 
   def test_builder_complains_without_controller
-    assert_raises(ArgumentError) do
+    assert_raise(ArgumentError) do
       ROUTING::RouteBuilder.new.build '/contact', :contoller => "contact", :action => "index"
     end
   end
@@ -1822,27 +1822,27 @@ class RouteSetTest < Test::Unit::TestCase
   end
 
   def test_route_requirements_with_anchor_chars_are_invalid
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /^\d+/
       end
     end
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\A\d+/
       end
     end
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+$/
       end
     end
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\Z/
       end
     end
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+\z/
       end
@@ -1851,14 +1851,14 @@ class RouteSetTest < Test::Unit::TestCase
       set.draw do |map|
         map.connect 'page/:id', :controller => 'pages', :action => 'show', :id => /\d+/, :name => /^(david|jamis)/
       end
-      assert_raises ActionController::RoutingError do
+      assert_raise ActionController::RoutingError do
         set.generate :controller => 'pages', :action => 'show', :id => 10
       end
     end
   end
 
   def test_route_requirements_with_invalid_http_method_is_invalid
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :invalid}
       end
@@ -1874,7 +1874,7 @@ class RouteSetTest < Test::Unit::TestCase
   end
 
   def test_route_requirements_with_head_method_condition_is_invalid
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'valid/route', :controller => 'pages', :action => 'show', :conditions => {:method => :head}
       end
@@ -1886,10 +1886,10 @@ class RouteSetTest < Test::Unit::TestCase
       map.connect 'page/37s', :controller => 'pages', :action => 'show', :name => /(jamis|david)/
     end
     assert_equal '/page/37s', set.generate(:controller => 'pages', :action => 'show', :name => 'jamis')
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       set.generate(:controller => 'pages', :action => 'show', :name => 'not_jamis')
     end
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       set.generate(:controller => 'pages', :action => 'show', :name => 'nor_jamis_and_david')
     end
   end
@@ -1932,7 +1932,7 @@ class RouteSetTest < Test::Unit::TestCase
     assert_equal("update", request.path_parameters[:action])
     request.recycle!
 
-    assert_raises(ActionController::UnknownHttpMethod) {
+    assert_raise(ActionController::UnknownHttpMethod) {
       request.env["REQUEST_METHOD"] = "BACON"
       set.recognize(request)
     }
@@ -2317,7 +2317,7 @@ class RouteSetTest < Test::Unit::TestCase
   end
 
   def test_route_requirements_with_unsupported_regexp_options_must_error
-    assert_raises ArgumentError do
+    assert_raise ArgumentError do
       set.draw do |map|
         map.connect 'page/:name', :controller => 'pages',
           :action => 'show',
@@ -2355,7 +2355,7 @@ class RouteSetTest < Test::Unit::TestCase
         :requirements => {:name => /(david|jamis)/i}
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       set.recognize_path('/page/davidjamis')
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => 'DAVID'}, set.recognize_path('/page/DAVID'))
@@ -2369,7 +2369,7 @@ class RouteSetTest < Test::Unit::TestCase
     end
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
     assert_equal "/page/david", url
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
     end
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
@@ -2389,10 +2389,10 @@ class RouteSetTest < Test::Unit::TestCase
     end
     assert_equal({:controller => 'pages', :action => 'show', :name => 'jamis'}, set.recognize_path('/page/jamis'))
     assert_equal({:controller => 'pages', :action => 'show', :name => 'david'}, set.recognize_path('/page/david'))
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       set.recognize_path('/page/david #The Creator')
     end
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       set.recognize_path('/page/David')
     end
   end
@@ -2410,10 +2410,10 @@ class RouteSetTest < Test::Unit::TestCase
     end
     url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
     assert_equal "/page/david", url
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
     end
-    assert_raises ActionController::RoutingError do
+    assert_raise ActionController::RoutingError do
       url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
     end
   end