remove legacy routes, simplify route specs for the unusual routes

saturnflyer · Jul 6, 2010 · e3add21 · e3add21
1 parent 3a4826c
commit e3add21
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 48 deletions.
diff --git a/config/routes.rb b/config/routes.rb
@@ -5,7 +5,4 @@
     admin.role_user '/roles/:role_id/users/:id', :controller => 'roles', :action => 'add_user', :conditions => {:method => :post}
     admin.role_users '/roles/:role_id/users', :controller => 'roles', :action => 'users', :conditions => {:method => :get}
   end
-  #legacy paths
-  map.rbac 'admin/rbac', :controller => 'admin/roles', :action => 'index'
-  map.role_details 'admin/roles/:id', :controller => 'admin/roles', :action => 'show'
 end
diff --git a/spec/controllers/admin/roles_routing_spec.rb b/spec/controllers/admin/roles_routing_spec.rb
@@ -2,60 +2,18 @@
 
 describe Admin::RolesController, 'routing' do
   describe "route generation" do
-    it "should map #new" do
-      route_for(:controller => "admin/roles", :action => "new").should == "/admin/roles/new"
-    end
-    it "should map #show" do
-      route_for(:controller => "admin/roles", :action => "show", :id => "1").should == "/admin/roles/1"
-    end
-    it "should map #edit" do
-      route_for(:controller => "admin/roles", :action => "edit", :id => "1").should == "/admin/roles/1/edit"
-    end
-    it "should map #update" do
-      route_for(:controller => "admin/roles", :action => "update", :id => "1").should == "/admin/roles/1"
-    end
-    it "should map #index" do
-      route_for(:controller => "admin/roles", :action => "index").should == '/admin/roles'
-    end
-    it "should map #create" do
-      route_for(:controller => "admin/roles", :action => "create").should == '/admin/roles'
-    end
-    it "should map #destroy" do
-      route_for(:controller => "admin/roles", :action => "destroy", :id => "1").should == '/admin/roles/1'
-    end
     it "should map #users" do
-      route_for(:controller => "admin/roles", :action => "users", :role_id => "1").should == '/admin/roles/1/users'
+      '/admin/roles/1/users'.should route_to(:controller => "admin/roles", :action => "users", :role_id => "1")
     end
     it "should map #add_user" do
-      route_for(:controller => "admin/roles", :action => "add_user", :role_id => "1", :id => "2").should == '/admin/roles/1/users/2'
+      {:post => '/admin/roles/1/users/2'}.should route_to(:controller => "admin/roles", :action => "add_user", :role_id => "1", :id => "2")
     end
     it "should map #remove_user" do
-      route_for(:controller => "admin/roles", :action => "remove_user", :role_id => "1", :id => "2").should == '/admin/roles/1/users/2'
+      { :delete => '/admin/roles/1/users/2'}.should route_to(:controller => "admin/roles", :action => "remove_user", :role_id => "1", :id => "2")
     end
   end
 
   describe "route recognition" do
-    it "should generate params for #new" do
-      params_from(:get, "/admin/roles/new").should == {:controller => "admin/roles", :action => "new"}
-    end
-    it "should generate params for #create" do
-      params_from(:post, "/admin/roles").should == {:controller => "admin/roles", :action => "create"}
-    end
-    it "should generate params for #show" do
-      params_from(:get, "/admin/roles/1").should == {:controller => "admin/roles", :action => "show", :id => "1"}
-    end
-    it "should generate params for #update" do
-      params_from(:get, "/admin/roles/1/edit").should == {:controller => "admin/roles", :action => "edit", :id => "1"}
-    end
-    it "should generate params for #update" do
-      params_from(:put, "/admin/roles/1").should == {:controller => "admin/roles", :action => "update", :id => "1"}
-    end
-    it "should generate params for #destroy" do
-      params_from(:delete, "/admin/roles/1").should == {:controller => "admin/roles", :action => "destroy", :id => "1"}
-    end
-    it "should generate params for #index" do
-      params_from(:get, "/admin/roles").should == {:controller => 'admin/roles', :action => 'index'}
-    end
     it "should generate params for #add_user" do
       params_from(:post, "/admin/roles/1/users/2").should == {:controller => 'admin/roles', :action => 'add_user', :role_id => '1', :id => '2'}
     end