@@ -6,7 +6,7 @@ describe "Recognizing requests for deferred routes" do before :each do Merb::Router.prepare do match("/deferred/:zoo").defer_to do |request, params| - route params.merge(:controller => "w00t") if params[:zoo] + params.merge(:controller => "w00t") if params[:zoo] end end end @@ -22,7 +22,7 @@ describe "Recognizing requests for deferred routes" do it "should return the param hash returned by the block" do Merb::Router.prepare do match("/deferred").defer_to do |request, params| - route :hello => "world" + :hello => "world" end end @@ -32,7 +32,7 @@ describe "Recognizing requests for deferred routes" do it "should accept params" do Merb::Router.prepare do match("/").defer_to(:controller => "accounts") do |request, params| - route params.update(:action => "hello") + params.update(:action => "hello") end end @@ -42,7 +42,7 @@ describe "Recognizing requests for deferred routes" do it "should be able to define routes after the deferred route" do Merb::Router.prepare do match("/deferred").defer_to do - route :hello => "world" + :hello => "world" end match("/").to(:foo => "bar") spec/public/router/recognition/deferred_spec.rb d4917e085ab21bd15ec1960745f0e5e3449a16aa Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/d425060afd09ba313ae5fba3568029106009abf8 d425060afd09ba313ae5fba3568029106009abf8 2008-10-11T00:00:50-07:00 2008-10-11T00:00:50-07:00 remove the route method from specs 71d34c974db790a3941b7138810216ff8de5f478 Andy Delcambre adelcambre@engineyard.com