@@ -11,20 +11,20 @@ describe <%= controller_class_name %>Controller 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 - route_for(:controller => "<%= table_name %>", :action => "show", :id => 1).should == "/<%= table_name %>/1" + it "should map { :controller => '<%= table_name %>', :action => 'show', :id => '1'} to /<%= table_name %>/1" 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 - route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1).should == "/<%= table_name %>/1<%= resource_edit_path %>" + it "should map { :controller => '<%= table_name %>', :action => 'edit', :id => '1' } to /<%= table_name %>/1<%= resource_edit_path %>" 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 - route_for(:controller => "<%= table_name %>", :action => "update", :id => 1).should == "/<%= table_name %>/1" + it "should map { :controller => '<%= table_name %>', :action => 'update', :id => '1' } to /<%= table_name %>/1" do + route_for(:controller => "<%= table_name %>", :action => "update", :id => "1").should == {:path => "/<%= table_name %>/1", :method => :put} end - it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => 1} to /<%= table_name %>/1" do - route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1).should == "/<%= table_name %>/1" + it "should map { :controller => '<%= table_name %>', :action => 'destroy', :id => '1' } to /<%= table_name %>/1" do + route_for(:controller => "<%= table_name %>", :action => "destroy", :id => "1").should == {:path => "/<%= table_name %>/1", :method => :delete} end end generators/scaffold_resource/templates/rspec/routing_spec.rb @@ -11,9 +11,9 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do <% end -%><% end %> assigns[:<%= table_name %>] = [<%= file_name %>_98, <%= file_name %>_99] - template.stub!(:object_url).and_return(<%= file_name %>_path(@<%= file_name %>)) + template.stub!(:object_url).and_return(<%= file_name %>_path(<%= file_name %>_99)) template.stub!(:new_object_url).and_return(new_<%= file_name %>_path) - template.stub!(:edit_object_url).and_return(edit_<%= file_name %>_path(@<%= file_name %>)) + template.stub!(:edit_object_url).and_return(edit_<%= file_name %>_path(<%= file_name %>_99)) end it "should render list of <%= table_name %>" do generators/scaffold_resource/templates/rspec/views/index_spec.rb ce9143f25fa11d9ee850b3b193e69f3dd732ed85 Denis Grankin liquidautumn@linux-0pnm.site http://github.com/giraffesoft/resource_controller/commit/7277cd88fa7efbbf4ed350913162989db996c33c 7277cd88fa7efbbf4ed350913162989db996c33c 2009-03-30T17:30:56-07:00 2009-03-30T17:30:56-07:00 fixes generator templates failing with current rspec version 2fdb8f309153811c06aad13ae2965a9d0c6a383c Denis Grankin liquidautumn@linux-0pnm.site