Update rackmount to fix some pending tests

rails · Dec 5, 2009 · 4663f75 · 4663f75
1 parent 3239589
commit 4663f75
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 14 deletions.
diff --git a/actionpack/actionpack.gemspec b/actionpack/actionpack.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency('activemodel',   '= 3.0.pre')
   s.add_dependency('rack',          '~> 1.0.1')
   s.add_dependency('rack-test',     '~> 0.5.0')
-  s.add_dependency('rack-mount',    '~> 0.3.0')
+  s.add_dependency('rack-mount',    '~> 0.3.2')
   s.add_dependency('erubis',        '~> 2.6.5')
 
   s.require_path = 'lib'

diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
@@ -1437,15 +1437,13 @@ def test_route_requirement_generate_with_extended_syntax
                                     )/x}
     end
 
-    pending do
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
-      assert_equal "/page/david", url
-      assert_raise ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
-      end
-      assert_raise ActionController::RoutingError do
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
+    assert_equal "/page/david", url
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
+    end
+    assert_raise ActionController::RoutingError do
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
     end
   end
 
@@ -1461,10 +1459,8 @@ def test_route_requirement_generate_with_xi_modifiers
                                     )/xi}
     end
 
-    pending do
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
-      assert_equal "/page/JAMIS", url
-    end
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
+    assert_equal "/page/JAMIS", url
   end
 
   def test_route_requirement_recognize_with_xi_modifiers