0
@@ -14,28 +14,28 @@ class Pink
0
   def monkey_id ; blue_id.monkey_id ; end
0
 end
0
 
0
+Merb::Router.prepare do |r|
0
+  r.default_routes
0
+  r.resources :monkeys do |m|
0
+    m.resources :blues do |b|
0
+      b.resources :pinks
0
+    end
0
+  end
0
+  r.resources :donkeys do |d|
0
+    d.resources :blues
0
+  end
0
+  r.resource :red do |red|
0
+    red.resources :blues
0
+  end
0
+  r.match(%r{/foo/(\d+)/}).to(:controller => 'asdf').name(:regexp)
0
+  r.match('/people/:name').
0
+    to(:controller => 'people', :action => 'show').name(:person)
0
+  r.match('/argstrs').to(:controller => "args").name(:args)
0
+end
0
 
0
 describe Merb::Controller, " url" do
0
   
0
   before do
0
-    Merb::Router.prepare do |r|
0
-      r.default_routes
0
-      r.resources :monkeys do |m|
0
-        m.resources :blues do |b|
0
-          b.resources :pinks
0
-        end
0
-      end
0
-      r.resources :donkeys do |d|
0
-        d.resources :blues
0
-      end
0
-      r.resource :red do |red|
0
-        red.resources :blues
0
-      end
0
-      r.match(%r{/foo/(\d+)/}).to(:controller => 'asdf').name(:regexp)
0
-      r.match('/people/:name').
0
-        to(:controller => 'people', :action => 'show').name(:person)
0
-      r.match('/argstrs').to(:controller => "args").name(:args)
0
-    end
0
     @controller = dispatch_to(Merb::Test::Fixtures::Controllers::Url, :index)
0
   end
0
   

0
@@ -1,21 +1,20 @@
0
 require File.join(File.dirname(__FILE__), "spec_helper")
0
 
0
-describe "nested resources routes" do
0
-  before :each do
0
-    Merb::Router.prepare do |r|
0
-      r.resources :blogposts do |b|
0
-        b.resources :comments do |c|
0
-          c.resources :versions
0
-        end
0
-      end
0
-      r.resources :users do |u|
0
-        u.resources :comments
0
-      end
0
-      r.resource :foo do |f|
0
-        f.resources :comments
0
-      end
0
+Merb::Router.prepare do |r|
0
+  r.resources :blogposts do |b|
0
+    b.resources :comments do |c|
0
+      c.resources :versions
0
     end
0
   end
0
+  r.resources :users do |u|
0
+    u.resources :comments
0
+  end
0
+  r.resource :foo do |f|
0
+    f.resources :comments
0
+  end
0
+end
0
+
0
+describe "nested resources routes" do
0
   
0
   it "should match a get to /blogposts/1/comments to the comments controller and index action with blogpost_id" do
0
     route_to('/blogposts/1/comments', :method => :get).should have_route(:controller => 'comments', :action => 'index', :id => nil, :blogpost_id => '1')