@@ -6,6 +6,7 @@ so the autotest executable won't automatically load rspec anymore. This allows rspec to live side by side other spec frameworks without always co-opting autotest through autotest's discovery mechanism. +* Generated route specs have shorter names, making it less painful to modify their implementation * Add conditional so Rails 2.1.0 doesn't warn about cache_template_extensions (patch from James Herdman) * Fixed stub_model examples to work with Rails 2.1.0 (the code was fine, just the examples needed patching) * use hoe for build/release History.txt @@ -2,59 +2,57 @@ require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_dep describe <%= controller_class_name %>Controller do describe "route generation" do - - it "should map { :controller => '<%= table_name %>', :action => 'index' } to /<%= table_name %>" do + it "should map #index" do route_for(:controller => "<%= table_name %>", :action => "index").should == "/<%= table_name %>" end - it "should map { :controller => '<%= table_name %>', :action => 'new' } to /<%= table_name %>/new" do + it "should map #new" do route_for(:controller => "<%= table_name %>", :action => "new").should == "/<%= table_name %>/new" end - it "should map { :controller => '<%= table_name %>', :action => 'show', :id => 1 } to /<%= table_name %>/1" do + it "should map #show" do route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1" end - it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => 1 } to /<%= table_name %>/1<%= resource_edit_path %>" do + it "should map #edit" do route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>" end - it "should map { :controller => '<%= table_name %>', :action => 'update', :id => 1} to /<%= table_name %>/1" do + it "should map #update" do route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1" end - it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do + it "should map #destroy" do route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1" end end describe "route recognition" do - - it "should generate params { :controller => '<%= table_name %>', action => 'index' } from GET /<%= table_name %>" do + it "should generate params for #index" do params_from(:get, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index"} end - it "should generate params { :controller => '<%= table_name %>', action => 'new' } from GET /<%= table_name %>/new" do + it "should generate params for #new" do params_from(:get, "/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new"} end - it "should generate params { :controller => '<%= table_name %>', action => 'create' } from POST /<%= table_name %>" do + it "should generate params for #create" do params_from(:post, "/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create"} end - it "should generate params { :controller => '<%= table_name %>', action => 'show', id => '1' } from GET /<%= table_name %>/1" do + it "should generate params for #show" do params_from(:get, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'edit', id => '1' } from GET /<%= table_name %>/1;edit" do + it "should generate params for #edit" do params_from(:get, "/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'update', id => '1' } from PUT /<%= table_name %>/1" do + it "should generate params for #update" do params_from(:put, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'destroy', id => '1' } from DELETE /<%= table_name %>/1" do + it "should generate params for #destroy" do params_from(:delete, "/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1"} end end generators/rspec_scaffold/templates/routing_spec.rb fff41e5a9bc3c684da1b43786952b9c50e4a0b35 Aslak Hellesøy aslak.hellesoy@gmail.com http://github.com/dchelimsky/rspec-rails/commit/732577a9326841a9c933b3b8d2479f9ef1fc2570 732577a9326841a9c933b3b8d2479f9ef1fc2570 2008-08-01T02:18:13-07:00 2008-08-01T02:18:13-07:00 Generated route specs have shorter names, making it less painful to modify their implementation eebf50d6a8077ed1d73bbfe2a5687bb6fcf9c409 Aslak Hellesøy aslak.hellesoy@gmail.com