From 03be27092bf51e78d0d3f3ee7fd0213023d43e0d Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Tue, 8 Jun 2010 16:20:46 -0400
Subject: Revert "Add shallow routes to the new router" for now. Needs more
 work.

This reverts commit 67a60ee314f53abcde78f8ecd2a1f7c9ef8264e1.
---
 actionpack/test/dispatch/routing_test.rb | 39 --------------------------------
 1 file changed, 39 deletions(-)

(limited to 'actionpack/test/dispatch')

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index a294535e88..5c46f9b971 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -34,33 +34,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      resources :users do
-        shallow do
-          resources :photos do
-            resources :types do
-              member do
-                post :preview
-              end
-              collection do
-                delete :erase
-              end
-            end
-          end
-        end
-      end
-      
-      shallow do
-        resources :teams do
-          resources :players
-        end
-      
-        resources :countries do
-          resources :cities do
-            resources :places
-          end
-        end
-      end
-
       match 'account/logout' => redirect("/logout"), :as => :logout_redirect
       match 'account/login', :to => redirect("/login")
 
@@ -779,18 +752,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_shallow_routes
-    with_test_routes do
-      assert_equal '/photos/4', photo_path(4)
-      assert_equal '/types/10/edit', edit_type_path(10) 
-      assert_equal '/types/5/preview', preview_type_path(5)
-      assert_equal '/photos/2/types', photo_types_path(2)
-      assert_equal '/cities/1/places', url_for(:controller => :places, :action => :index, :city_id => 1, :only_path => true)
-      assert_equal '/teams/new', url_for(:controller => :teams, :action => :new, :only_path => true)
-      assert_equal '/photos/11/types/erase', url_for(:controller => :types, :action => :erase, :photo_id => 11, :only_path => true)
-    end
-  end
-
   def test_update_project_person
     with_test_routes do
       get '/projects/1/people/2/update'
-- 
cgit v1.2.3