Skip to content
This repository
Browse code

Update rackmount to fix some pending tests

  • Loading branch information...
commit 4663f75f6b1c1e1de35e165cf7d01b83331775ae 1 parent 3239589
Joshua Peek authored December 05, 2009
2  actionpack/actionpack.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
18 18
   s.add_dependency('activemodel',   '= 3.0.pre')
19 19
   s.add_dependency('rack',          '~> 1.0.1')
20 20
   s.add_dependency('rack-test',     '~> 0.5.0')
21  
-  s.add_dependency('rack-mount',    '~> 0.3.0')
  21
+  s.add_dependency('rack-mount',    '~> 0.3.2')
22 22
   s.add_dependency('erubis',        '~> 2.6.5')
23 23
 
24 24
   s.require_path = 'lib'
22  actionpack/test/controller/routing_test.rb
@@ -1437,15 +1437,13 @@ def test_route_requirement_generate_with_extended_syntax
1437 1437
                                     )/x}
1438 1438
     end
1439 1439
 
1440  
-    pending do
1441  
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
1442  
-      assert_equal "/page/david", url
1443  
-      assert_raise ActionController::RoutingError do
1444  
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
1445  
-      end
1446  
-      assert_raise ActionController::RoutingError do
1447  
-        url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
1448  
-      end
  1440
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'david'})
  1441
+    assert_equal "/page/david", url
  1442
+    assert_raise ActionController::RoutingError do
  1443
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'davidjamis'})
  1444
+    end
  1445
+    assert_raise ActionController::RoutingError do
  1446
+      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
1449 1447
     end
1450 1448
   end
1451 1449
 
@@ -1461,10 +1459,8 @@ def test_route_requirement_generate_with_xi_modifiers
1461 1459
                                     )/xi}
1462 1460
     end
1463 1461
 
1464  
-    pending do
1465  
-      url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
1466  
-      assert_equal "/page/JAMIS", url
1467  
-    end
  1462
+    url = set.generate({:controller => 'pages', :action => 'show', :name => 'JAMIS'})
  1463
+    assert_equal "/page/JAMIS", url
1468 1464
   end
1469 1465
 
1470 1466
   def test_route_requirement_recognize_with_xi_modifiers

0 notes on commit 4663f75

Please sign in to comment.
Something went wrong with that request. Please try again.