@@ -81,7 +81,7 @@ class RspecNestedScaffoldGenerator < Rails::Generator::NamedBase "rspec_nested_scaffold:view_#{action}.#{@default_file_extension}", File.join('app/views', controller_class_path, controller_file_name, "#{action}.#{default_file_extension}") ) - + m.template "rspec_nested_scaffold:#{action}_erb_spec.rb", File.join('spec/views', controller_class_path, controller_file_name, "#{action}.#{default_file_extension}_spec.rb") end generators/rspec_nested_scaffold/rspec_nested_scaffold_generator.rb @@ -1,10 +1,11 @@ class <%= controller_class_name %>Controller < ApplicationController + before_filter :load_<%= nesting_owner %> + protected - # The nested resource owner. - def <%= nesting_owner %> - @<%=nesting_owner %> ||= <%= nesting_owner_class %>.find(params[:<%= nesting_owner %>_id]) + def load_<%= nesting_owner %> + @<%=nesting_owner %> = <%= nesting_owner_class %>.find(params[:<%= nesting_owner %>_id]) end public @@ -12,7 +13,7 @@ class <%= controller_class_name %>Controller < ApplicationController # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %> # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>.xml def index - @<%= table_name %> = <%= nesting_owner %>.<%= table_name %>.find(:all) + @<%= table_name %> = @<%= nesting_owner %>.<%= table_name %> respond_to do |format| format.html # index.html.erb @@ -23,7 +24,7 @@ class <%= controller_class_name %>Controller < ApplicationController # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/1 # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/1.xml def show - @<%= file_name %> = <%= nesting_owner %>.<%= table_name %>.find(params[:id]) + @<%= file_name %> = @<%= nesting_owner %>.<%= table_name %>.find(params[:id]) respond_to do |format| format.html # show.html.erb @@ -34,7 +35,7 @@ class <%= controller_class_name %>Controller < ApplicationController # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/new # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/new.xml def new - @<%= file_name %> = <%= nesting_owner %>.<%= table_name %>.build + @<%= file_name %> = @<%= nesting_owner %>.<%= table_name %>.new respond_to do |format| format.html # new.html.erb @@ -44,18 +45,18 @@ class <%= controller_class_name %>Controller < ApplicationController # GET /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/edit def edit - @<%= file_name %> = <%= nesting_owner %>.<%= table_name %>.find(params[:id]) + @<%= file_name %> = @<%= nesting_owner %>.<%= table_name %>.find(params[:id]) end # POST /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %> # POST /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>.xml def create - @<%= file_name %> = <%= nesting_owner %>.<%= table_name %>.build(params[:<%= file_name %>]) + @<%= file_name %> = @<%= nesting_owner %>.<%= table_name %>.new(params[:<%= file_name %>]) respond_to do |format| if @<%= file_name %>.save flash[:notice] = '<%= class_name %> was successfully created.' - format.html { redirect_to(<%= nesting_owner %>_<%= file_name %>_url(<%= nesting_owner %>, @<%= file_name %>)) } + format.html { redirect_to([@<%= nesting_owner %>, @<%= file_name %>]) } format.xml { render :xml => @<%= file_name %>, :status => :created, :location => <%= nesting_owner %>_<%= file_name %>_path(<%= nesting_owner %>, @<%= file_name %>) } else format.html { render :action => "new" } @@ -67,12 +68,12 @@ class <%= controller_class_name %>Controller < ApplicationController # PUT /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/1 # PUT /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/1.xml def update - @<%= file_name %> = <%= nesting_owner %>.<%= table_name %>.find(params[:id]) + @<%= file_name %> = @<%= nesting_owner %>.<%= table_name %>.find(params[:id]) respond_to do |format| if @<%= file_name %>.update_attributes(params[:<%= file_name %>]) flash[:notice] = '<%= class_name %> was successfully updated.' - format.html { redirect_to(<%= nesting_owner %>_<%= file_name %>_url(<%= nesting_owner %>, @<%= file_name %>)) } + format.html { redirect_to([@<%= nesting_owner %>, @<%= file_name %>]) } format.xml { head :ok } else format.html { render :action => "edit" } @@ -84,11 +85,11 @@ class <%= controller_class_name %>Controller < ApplicationController # DELETE /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/1 # DELETE /<%=nesting_owner.pluralize%>/:<%=nesting_owner%>_id/<%= table_name %>/1.xml def destroy - @<%= file_name %> = <%= nesting_owner %>.<%= table_name %>.find(params[:id]) + @<%= file_name %> = @<%= nesting_owner %>.<%= table_name %>.find(params[:id]) @<%= file_name %>.destroy respond_to do |format| - format.html { redirect_to(<%= nesting_owner %>_<%= table_name %>_path(<%= nesting_owner %>)) } + format.html { redirect_to(<%= nesting_owner %>_<%= table_name %>_path(@<%= nesting_owner %>)) } format.xml { head :ok } end end generators/rspec_nested_scaffold/templates/controller.rb @@ -1,336 +1,181 @@ -require File.dirname(__FILE__) + '/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper') describe <%= controller_class_name %>Controller do - before(:each) do - @<%= file_name %> = mock_model(<%= class_name %>, :to_param => '1') - @<%= nesting_owner %> = mock_model(<%= nesting_owner_class %>, :<%= table_name %> => [@<%= file_name %>], :to_param => '2') - <%= nesting_owner_class %>.stub!(:find).with('2').and_return(@<%= nesting_owner %>) - end - - describe "handling GET /<%= nesting_owner %>s/:<%= nesting_owner %>_id/<%= table_name %>" do - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).with(:all).and_return([@<%= file_name %>]) - end - def do_get - get :index, :<%= nesting_owner %>_id => '2' - end - - it "should be successful" do - do_get - response.should be_success - end - - it "should assign the found <%= nesting_owner %> for the view" do - do_get - assigns[:<%= nesting_owner %>].should == @<%= nesting_owner %> - end - - it "should render index template" do - do_get - response.should render_template('index') - end - - it "should find all <%= table_name %> owned by <%= nesting_owner %>" do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).with(:all).and_return([@<%= file_name %>]) - do_get - end - it "should assign the found <%= table_name %> for the view" do - do_get - assigns[:<%= table_name %>].should == [@<%= file_name %>] - end + def mock_<%= file_name %>(stubs={}) + @mock_<%= file_name %> ||= mock_model(<%= class_name %>, stubs) end - - describe "handling GET /<%= nesting_owner %>s/:<%= nesting_owner %>_id/<%= table_name %>.xml" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return([@<%= file_name %>]) - end - - def do_get - @<%= nesting_owner %>.<%= table_name %>.stub!(:to_xml).and_return("XML") - @<%= file_name %>.stub!(:to_xml).and_return("XML") - @request.env["HTTP_ACCEPT"] = "application/xml" - get :index, :<%= nesting_owner %>_id => '2' - end - - it "should be successful" do - do_get - response.should be_success - end - - it "should find all <%= table_name %>" do - @<%= nesting_owner %>.<%= table_name %>.should_receive(:find).and_return([@<%= file_name %>]) - do_get - end - - it "should render the found <%= table_name %> as xml" do - @<%= file_name %>.should_receive(:to_xml).and_return("XML") - do_get - end + + def mock_<%= nesting_owner %>(stubs={}) + @mock_<%= nesting_owner %> ||= mock_model(<%= nesting_owner_class %>, stubs.reverse_merge(:<%= table_name %> => mock('Array of <%= class_name.pluralize %>'))) end - - describe "handling GET /<%= nesting_owner %>s/:<%= nesting_owner %>_id/<%= table_name %>/1" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).with('1').and_return(@<%= file_name %>) - end - - def do_get - get :show, :<%= nesting_owner %>_id => '2', :id => '1' - end - - it "should be successful" do - do_get - response.should be_success - end - - it "should render show template" do - do_get - response.should render_template('show') - end - - it "should find the <%= file_name %> requested" do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).with('1').and_return(@<%= file_name %>) - do_get - end - - it "should assign the found <%= file_name %> for the view" do - do_get - assigns[:<%= file_name %>].should equal(@<%= file_name %>) - end - - it "should assign the found <%= nesting_owner %> for the view" do - do_get - assigns[:<%= nesting_owner %>].should == @<%= nesting_owner %> - end - + + before(:each) do + <%= nesting_owner_class %>.stub!(:find).with("1").and_return(mock_<%= nesting_owner %>) end - - describe "handling GET /<%= nesting_owner %>s/:<%= nesting_owner %>_id/<%= table_name %>/1.xml" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).with('1').and_return(@<%= file_name %>) - end - - def do_get - @request.env["HTTP_ACCEPT"] = "application/xml" - get :show, :<%= nesting_owner %>_id => '2', :id => '1' - end - - it "should be successful" do - do_get - response.should be_success - end - - it "should find the <%= file_name %> requested" do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).with('1').and_return(@<%= file_name %>) - do_get + + describe "responding to GET index" do + + it "should expose all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do + mock_<%= nesting_owner %>.should_receive(:<%= table_name %>).with(no_args).and_return([mock_<%= file_name %>]) + get :index, :<%= nesting_owner %>_id => "1" + assigns[:<%= table_name %>].should == [mock_<%= file_name %>] + end + + describe "with mime type of xml" do + + it "should render all <%= table_name.pluralize %> as xml" do + request.env["HTTP_ACCEPT"] = "application/xml" + mock_<%= nesting_owner %>.should_receive(:<%= table_name %>).with(no_args).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>")) + <%= table_name %>.should_receive(:to_xml).and_return("generated XML") + get :index, :<%= nesting_owner %>_id => "1" + response.body.should == "generated XML" + end + end - it "should render the found <%= file_name %> as xml" do - @<%= file_name %>.stub!(:to_xml).and_return("XML") - do_get - response.body.should == "XML" - end end - describe "handling GET /<%= nesting_owner %>s/:<%= nesting_owner %>_id/<%= table_name %>/new" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:build).and_return(@<%= file_name %>) - end + describe "responding to GET show" do - def do_get - get :new, :<%= nesting_owner %>_id => '2' + it "should expose the requested <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + get :show, :id => "37", :<%= nesting_owner %>_id => "1" + assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end + + describe "with mime type of xml" do - it "should be successful" do - do_get - response.should be_success - end - - it "should render new template" do - do_get - response.should render_template('new') - end - - it "should create an new <%= file_name %>" do - @<%= nesting_owner %>.<%= table_name %>.should_receive(:build).and_return(@<%= file_name %>) - do_get - end - - it "should not save the new <%= file_name %>" do - @<%= file_name %>.should_not_receive(:save) - do_get - end - - it "should assign the new <%= file_name %> for the view" do - do_get - assigns[:<%= file_name %>].should equal(@<%= file_name %>) - end + it "should render the requested <%= file_name %> as xml" do + request.env["HTTP_ACCEPT"] = "application/xml" + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:to_xml).and_return("generated XML") + get :show, :id => "37", :<%= nesting_owner %>_id => "1" + response.body.should == "generated XML" + end - it "should assign the <%= nesting_owner_class %> for the view" do - do_get - assigns[:<%= nesting_owner %>].should equal(@<%= nesting_owner %>) end + end - describe "handling GET /<%= nesting_owner %>s/:<%= nesting_owner %>_id/<%= table_name %>/1/edit" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(@<%= file_name %>) - end - - def do_get - get :edit, :<%= nesting_owner %>_id => '2', :id => '1' - end - - it "should be successful" do - do_get - response.should be_success - end - - it "should render edit template" do - do_get - response.should render_template('edit') - end - - it "should find the <%= file_name %> requested" do - @<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with('1').and_return(@<%= file_name %>) - do_get - end - - it "should assign the found <%= class_name %> for the view" do - do_get - assigns[:<%= file_name %>].should equal(@<%= file_name %>) + describe "responding to GET new" do + + it "should expose a new <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:new).and_return(mock_<%= file_name %>) + get :new, :<%= nesting_owner %>_id => "1" + assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - it "should assign the <%= nesting_owner_class %> for the view" do - do_get - assigns[:<%= nesting_owner %>].should equal(@<%= nesting_owner %>) - end end - describe "handling POST /<%= nesting_owner.pluralize %>/:<%= nesting_owner %>_id/<%= table_name %>" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:build).and_return(@<%= file_name %>) + describe "responding to GET edit" do + + it "should expose the requested <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + get :edit, :id => "37", :<%= nesting_owner %>_id => "1" + assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - describe "with successful save" do + end - def do_post - @<%= file_name %>.should_receive(:save).and_return(true) - post :create, :<%= nesting_owner %>_id => '2', :<%= file_name %> => {} - end + describe "responding to POST create" do - it "should create a new <%= file_name %>" do - @<%= nesting_owner %>.<%= table_name %>.should_receive(:build).with({}).and_return(@<%= file_name %>) - do_post + describe "with valid params" do + + it "should expose a newly created <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true)) + post :create, :<%= file_name %> => {:these => 'params'}, :<%= nesting_owner %>_id => "1" + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end - it "should redirect to the new <%= file_name %>" do - do_post - response.should redirect_to(<%= nesting_owner %>_<%= file_name %>_path(@<%= nesting_owner %>, @<%= file_name %>)) + it "should redirect to the created <%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => true)) + post :create, :<%= file_name %> => {}, :<%= nesting_owner %>_id => "1" + response.should redirect_to(<%= nesting_owner %>_<%= file_name %>_url(mock_<%= nesting_owner %>, mock_<%= file_name %>)) end - + end + + describe "with invalid params" do - describe "with failed save" do - - def do_post - @<%= file_name %>.should_receive(:save).and_return(false) - post :create, :<%= nesting_owner %>_id => '2', :<%= file_name %> => {} + it "should expose a newly created but unsaved <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false)) + post :create, :<%= file_name %> => {:these => 'params'}, :<%= nesting_owner %>_id => "1" + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end - it "should re-render 'new'" do - do_post + it "should re-render the 'new' template" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:new).and_return(mock_<%= file_name %>(:save => false)) + post :create, :<%= file_name %> => {}, :<%= nesting_owner %>_id => "1" response.should render_template('new') end - + end + end - describe "handling PUT /<%= nesting_owner.pluralize %>/:<%= nesting_owner %>_id/<%= table_name %>/1" do - - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(@<%= file_name %>) - end - - describe "with successful update" do - - def do_put - @<%= file_name %>.should_receive(:update_attributes).and_return(true) - put :update, :<%= nesting_owner %>_id => '2', :id => '1' - end - - it "should find the <%= file_name %> requested" do - @<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with('1').and_return(@<%= file_name %>) - do_put - end + describe "responding to PUT udpate" do - it "should update the found <%= file_name %>" do - do_put - assigns(:<%= file_name %>).should equal(@<%= file_name %>) - end + describe "with valid params" do - it "should assign the found <%= file_name %> for the view" do - do_put - assigns(:<%= file_name %>).should equal(@<%= file_name %>) + it "should update the requested <%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'}) + put :update, :id => "37", :<%= file_name %> => {:these => 'params'}, :<%= nesting_owner %>_id => "1" end - it "should assign the <%= nesting_owner %> for the view" do - do_put - assigns(:<%= nesting_owner %>).should equal(@<%= nesting_owner %>) + it "should expose the requested <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true)) + put :update, :id => "1", :<%= nesting_owner %>_id => "1" + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end it "should redirect to the <%= file_name %>" do - do_put - response.should redirect_to(<%= nesting_owner %>_<%= file_name %>_url(@<%= nesting_owner %>, @<%= file_name %>)) + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true)) + put :update, :id => "1", :<%= nesting_owner %>_id => "1" + response.should redirect_to(<%= nesting_owner %>_<%= file_name %>_url(mock_<%= nesting_owner %>, mock_<%= file_name %>)) end end + + describe "with invalid params" do - describe "with failed update" do + it "should update the requested <%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:update_attributes).with({'these' => 'params'}) + put :update, :id => "37", :<%= file_name %> => {:these => 'params'}, :<%= nesting_owner %>_id => "1" + end - def do_put - @<%= file_name %>.should_receive(:update_attributes).and_return(false) - put :update, :<%= nesting_owner %>_id => '2', :id => '1' + it "should expose the <%= file_name %> as @<%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false)) + put :update, :id => "1", :<%= nesting_owner %>_id => "1" + assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) end - it "should re-render 'edit'" do - do_put + it "should re-render the 'edit' template" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false)) + put :update, :id => "1", :<%= nesting_owner %>_id => "1" response.should render_template('edit') end end - end - - describe "handling DELETE /<%= nesting_owner.pluralize %>/:<%= nesting_owner %>_id/<%= table_name %>/1" do - before(:each) do - @<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(@<%= file_name %>) - @<%= file_name %>.stub!(:destroy).and_return(true) - end + end - def do_delete - delete :destroy, :<%= nesting_owner %>_id => '2', :id => '1' - end + describe "responding to DELETE destroy" do - it "should find the <%= file_name %> requested" do - @<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with('1').and_return(@<%= file_name %>) - do_delete + it "should destroy the requested <%= file_name %>" do + mock_<%= nesting_owner %>.<%= table_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) + mock_<%= file_name %>.should_receive(:destroy) + delete :destroy, :id => "37", :<%= nesting_owner %>_id => "1" end - - it "should call destroy on the found <%= file_name %>" do - @<%= file_name %>.should_receive(:destroy) - do_delete + + it "should redirect to the <%= table_name %> list" do + mock_<%= nesting_owner %>.<%= table_name %>.stub!(:find).and_return(mock_<%= file_name %>(:destroy => true)) + delete :destroy, :id => "1", :<%= nesting_owner %>_id => "1" + response.should redirect_to(<%= nesting_owner %>_<%= table_name %>_url(mock_<%= nesting_owner %>)) end - it "should redirect to the <%= nesting_owner %>'s <%= table_name %> list" do - do_delete - response.should redirect_to(<%= nesting_owner %>_<%= table_name %>_url(@<%= nesting_owner %>)) - end end + end generators/rspec_nested_scaffold/templates/controller_spec.rb @@ -1,25 +1,22 @@ -require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') describe "/<%= table_name %>/edit.<%= default_file_extension %>" do include <%= controller_class_name %>Helper - before do - @<%= file_name %> = mock_model(<%= class_name %>) - @<%= nesting_owner %> = mock_model(<%= nesting_owner_class %>) -<% for attribute in attributes -%> - @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>) -<% end -%> - assigns[:<%= file_name %>] = @<%= file_name %> - assigns[:<%= nesting_owner %>] = @<%= nesting_owner %> + before(:each) do + assigns[:<%= nesting_owner %>] = @<%= nesting_owner %> = stub_model(<%= nesting_owner_class %>) + assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %>, + :new_record? => false<%= attributes.empty? ? '' : ',' %> +<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> +<% end -%><% end -%> + ) end it "should render edit form" do render "/<%= table_name %>/edit.<%= default_file_extension %>" response.should have_tag("form[action=#{<%= nesting_owner %>_<%= file_name %>_path(@<%= nesting_owner %>, @<%= file_name %>)}][method=post]") do - with_tag('div[style=?]', "margin:0;padding:0") do - with_tag('input[name=_method][type=hidden][value=put]') - end <% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> with_tag('<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]', "<%= file_name %>[<%= attribute.name %>]") <% end -%><% end -%> generators/rspec_nested_scaffold/templates/edit_erb_spec.rb @@ -1,17 +1,21 @@ -require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') describe "/<%= table_name %>/index.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do -<% [98,99].each do |id| -%> - <%= file_name %>_<%= id %> = mock_model(<%= class_name %>) -<% for attribute in attributes -%> - <%= file_name %>_<%= id %>.should_receive(:<%= attribute.name %>).and_return(<%= attribute.default_value %>) -<% end -%><% end %> - @<%= nesting_owner %> = mock_model(<%= nesting_owner_class %>) - assigns[:<%= table_name %>] = [<%= file_name %>_98, <%= file_name %>_99] - assigns[:<%= nesting_owner %>] = @<%= nesting_owner %> + assigns[:<%= nesting_owner %>] = stub_model(<%= nesting_owner_class %>) + assigns[:<%= table_name %>] = [ +<% [1,2].each_with_index do |id, model_index| -%> + stub_model(<%= class_name %><%= attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %> +<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> +<% end -%><% end -%> +<% if !attributes.empty? -%> + <%= model_index == 1 ? ')' : '),' %> +<% end -%> +<% end -%> + ] end it "should render list of <%= table_name %>" do @@ -21,4 +25,3 @@ describe "/<%= table_name %>/index.<%= default_file_extension %>" do <% end -%><% end -%> end end - generators/rspec_nested_scaffold/templates/index_erb_spec.rb @@ -1,24 +1,22 @@ -require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') describe "/<%= table_name %>/new.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do - @<%= file_name %> = mock_model(<%= class_name %>) - @<%= file_name %>.stub!(:new_record?).and_return(true) - @<%= nesting_owner %> = mock_model(<%= nesting_owner_class %>) -<% for attribute in attributes -%> - @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>) -<% end -%> - assigns[:<%= file_name %>] = @<%= file_name %> - assigns[:<%= nesting_owner %>] = @<%= nesting_owner %> + assigns[:<%= nesting_owner %>] = @<%= nesting_owner %> = stub_model(<%= nesting_owner_class %>) + assigns[:<%= file_name %>] = stub_model(<%= class_name %>, + :new_record? => true<%= attributes.empty? ? '' : ',' %> +<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> +<% end -%><% end -%> + ) end it "should render new form" do render "/<%= table_name %>/new.<%= default_file_extension %>" response.should have_tag("form[action=?][method=post]", <%= nesting_owner %>_<%= table_name %>_path(@<%= nesting_owner %>)) do - with_tag('input[name=_method][type=hidden][value=put]', :count => 0) <% for attribute in attributes -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> with_tag("<%= attribute.input_type -%>#<%= file_name %>_<%= attribute.name %>[name=?]", "<%= file_name %>[<%= attribute.name %>]") <% end -%><% end -%> generators/rspec_nested_scaffold/templates/new_erb_spec.rb @@ -1,61 +1,59 @@ -require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_helper') describe <%= controller_class_name %>Controller do describe "route generation" do - - it "should map { :controller => '<%= table_name %>', :action => 'index', :<%= nesting_owner %>_id => '2' } to /<%= nesting_owner.pluralize %>/2/<%= table_name %>" do - route_for(:controller => "<%= table_name %>", :action => 'index', :<%= nesting_owner %>_id => '2').should == "/<%= nesting_owner.pluralize %>/2/<%= table_name %>" + it "should map #index" do + route_for(:controller => "<%= table_name %>", :action => "index", :<%= nesting_owner %>_id => 1).should == "/<%= nesting_owner.pluralize %>/1/<%= table_name %>" end - it "should map { :controller => '<%= table_name %>', :action => 'new', :<%= nesting_owner %>_id => '2' } to /<%= nesting_owner.pluralize %>/2/<%= table_name %>/new" do - route_for(:controller => "<%= table_name %>", :action => 'new', :<%= nesting_owner %>_id => '2').should == "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/new" + it "should map #new" do + route_for(:controller => "<%= table_name %>", :action => "new", :<%= nesting_owner %>_id => 1).should == "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/new" end - it "should map { :controller => '<%= table_name %>', :action => 'show', :<%= nesting_owner %>_id => '2', :id => 1 } to /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" do - route_for(:controller => "<%= table_name %>", :action => 'show', :<%= nesting_owner %>_id => '2', :id => 1).should == "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" + it "should map #show" do + route_for(:controller => "<%= table_name %>", :action => "show", :id => 1, :<%= nesting_owner %>_id => 1).should == "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1" end - it "should map { :controller => '<%= table_name %>', :action => 'edit', :<%= nesting_owner %>_id => '2', :id => 1 } to /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1<%= resource_edit_path %>" do - route_for(:controller => "<%= table_name %>", :action => 'edit', :<%= nesting_owner %>_id => '2', :id => 1).should == "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1<%= resource_edit_path %>" + it "should map #edit" do + route_for(:controller => "<%= table_name %>", :action => "edit", :id => 1, :<%= nesting_owner %>_id => 1).should == "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1<%= resource_edit_path %>" end - it "should map { :controller => '<%= table_name %>', :action => 'update', :<%= nesting_owner %>_id => '2', :id => 1} to /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" do - route_for(:controller => "<%= table_name %>", :action => 'update', :<%= nesting_owner %>_id => '2', :id => 1).should == "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" + it "should map #update" do + route_for(:controller => "<%= table_name %>", :action => "update", :id => 1, :<%= nesting_owner %>_id => 1).should == "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1" end - it "should map { :controller => '<%= table_name %>', :action => 'destroy', :<%= nesting_owner %>_id => '2', :id => 1} to /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" do - route_for(:controller => "<%= table_name %>", :action => 'destroy', :<%= nesting_owner %>_id => '2', :id => 1).should == "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" + it "should map #destroy" do + route_for(:controller => "<%= table_name %>", :action => "destroy", :id => 1, :<%= nesting_owner %>_id => 1).should == "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1" end end describe "route recognition" do - - it "should generate params { :controller => '<%= table_name %>', action => 'index', :<%= nesting_owner %>_id => '2' } from GET /<%= nesting_owner.pluralize %>/2/<%= table_name %>" do - params_from(:get, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => 'index', :<%= nesting_owner %>_id => '2'} + it "should generate params for #index" do + params_from(:get, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "index", :<%= nesting_owner %>_id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'new', :<%= nesting_owner %>_id => '2' } from GET /<%= nesting_owner.pluralize %>/2/<%= table_name %>/new" do - params_from(:get, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => 'new', :<%= nesting_owner %>_id => '2'} + it "should generate params for #new" do + params_from(:get, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/new").should == {:controller => "<%= table_name %>", :action => "new", :<%= nesting_owner %>_id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'create', :<%= nesting_owner %>_id => '2' } from POST /<%= nesting_owner.pluralize %>/2/<%= table_name %>" do - params_from(:post, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => 'create', :<%= nesting_owner %>_id => '2'} + it "should generate params for #create" do + params_from(:post, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>").should == {:controller => "<%= table_name %>", :action => "create", :<%= nesting_owner %>_id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'show', :<%= nesting_owner %>_id => '2', id => '1' } from GET /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" do - params_from(:get, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => 'show', :<%= nesting_owner %>_id => '2', :id => "1"} + it "should generate params for #show" do + params_from(:get, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "show", :id => "1", :<%= nesting_owner %>_id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'edit', :<%= nesting_owner %>_id => '2', id => '1' } from GET /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1;edit" do - params_from(:get, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => 'edit', :<%= nesting_owner %>_id => '2', :id => "1"} + it "should generate params for #edit" do + params_from(:get, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1<%= resource_edit_path %>").should == {:controller => "<%= table_name %>", :action => "edit", :id => "1", :<%= nesting_owner %>_id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'update', :<%= nesting_owner %>_id => '2', id => '1' } from PUT /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" do - params_from(:put, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => 'update', :<%= nesting_owner %>_id => '2', :id => "1"} + it "should generate params for #update" do + params_from(:put, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "update", :id => "1", :<%= nesting_owner %>_id => "1"} end - it "should generate params { :controller => '<%= table_name %>', action => 'destroy', :<%= nesting_owner %>_id => '2', id => '1' } from DELETE /<%= nesting_owner.pluralize %>/2/<%= table_name %>/1" do - params_from(:delete, "/<%= nesting_owner.pluralize %>/2/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => 'destroy', :<%= nesting_owner %>_id => '2', :id => "1"} + it "should generate params for #destroy" do + params_from(:delete, "/<%= nesting_owner.pluralize %>/1/<%= table_name %>/1").should == {:controller => "<%= table_name %>", :action => "destroy", :id => "1", :<%= nesting_owner %>_id => "1"} end end -end \ No newline at end of file +end generators/rspec_nested_scaffold/templates/routing_spec.rb @@ -1,16 +1,17 @@ -require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper' +require File.expand_path(File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../../spec_helper') describe "/<%= table_name %>/show.<%= default_file_extension %>" do include <%= controller_class_name %>Helper before(:each) do - @<%= file_name %> = mock_model(<%= class_name %>) - @<%= nesting_owner %> = mock_model(<%= nesting_owner_class %>) -<% for attribute in attributes -%> - @<%= file_name %>.stub!(:<%= attribute.name %>).and_return(<%= attribute.default_value %>) + assigns[:<%= nesting_owner %>] = stub_model(<%= nesting_owner_class %>) + assigns[:<%= file_name %>] = @<%= file_name %> = stub_model(<%= class_name %><%= attributes.empty? ? ')' : ',' %> +<% attributes.each_with_index do |attribute, attribute_index| -%><% unless attribute.name =~ /_id/ || [:datetime, :timestamp, :time, :date].index(attribute.type) -%> + :<%= attribute.name %> => <%= attribute.default_value %><%= attribute_index == attributes.length - 1 ? '' : ','%> +<% end -%><% end -%> +<% if !attributes.empty? -%> + ) <% end -%> - assigns[:<%= nesting_owner %>] = @<%= nesting_owner %> - assigns[:<%= file_name %>] = @<%= file_name %> end it "should render attributes in <p>" do generators/rspec_nested_scaffold/templates/show_erb_spec.rb @@ -1,11 +1,11 @@ <h1>Editing <%= singular_name %></h1> -<%%= error_messages_for :<%= singular_name %> %> +<%% form_for([@<%= nesting_owner %>, @<%= singular_name %>]) do |f| %> + <%%= f.error_messages %> -<%% form_for(:<%= singular_name %>, @<%= singular_name %>, :url => <%= nesting_owner %>_<%= singular_name %>_path(@<%= nesting_owner %>, @<%= singular_name %>), :html => {:method => :put}) do |f| %> <% for attribute in attributes -%> <p> - <%%= f.label :<%= attribute.name %> %><br /> + <%%= f.label :<%= attribute.name %> %><br /> <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> </p> <% end -%> @@ -14,5 +14,5 @@ </p> <%% end %> -<%%= link_to 'Show', <%= nesting_owner %>_<%= singular_name %>_path(@<%= nesting_owner %>, @<%= singular_name %>) %> | +<%%= link_to 'Show', [@<%= nesting_owner %>, @<%= singular_name %>] %> | <%%= link_to 'Back', <%= nesting_owner %>_<%= plural_name %>_path(@<%= nesting_owner %>) %> generators/rspec_nested_scaffold/templates/view_edit.html.erb @@ -12,9 +12,9 @@ <% for attribute in attributes -%> <td><%%=h <%= singular_name %>.<%= attribute.name %> %></td> <% end -%> - <td><%%= link_to 'Show', <%= nesting_owner %>_<%= singular_name %>_path(@<%= nesting_owner %>, <%= singular_name %>) %></td> + <td><%%= link_to 'Show', [@<%= nesting_owner %>, <%= singular_name %>] %></td> <td><%%= link_to 'Edit', edit_<%= nesting_owner %>_<%= singular_name %>_path(@<%= nesting_owner %>, <%= singular_name %>) %></td> - <td><%%= link_to 'Destroy', <%= nesting_owner %>_<%= singular_name %>_path(@<%= nesting_owner %>, <%= singular_name %>), :confirm => 'Are you sure?', :method => :delete %></td> + <td><%%= link_to 'Destroy', [@<%= nesting_owner %>, <%= singular_name %>], :confirm => 'Are you sure?', :method => :delete %></td> </tr> <%% end %> </table> generators/rspec_nested_scaffold/templates/view_index.html.erb @@ -1,11 +1,11 @@ <h1>New <%= singular_name %></h1> -<%%= error_messages_for :<%= singular_name %> %> +<%% form_for([@<%= nesting_owner %>, @<%= singular_name %>]) do |f| %> + <%%= f.error_messages %> -<%% form_for(:<%= singular_name %>, @<%= singular_name %>, :url => <%= nesting_owner %>_<%= plural_name %>_path(@<%= nesting_owner %>)) do |f| %> <% for attribute in attributes -%> <p> - <%%= f.label :<%= attribute.name %> %><br /> + <%%= f.label :<%= attribute.name %> %><br /> <%%= f.<%= attribute.field_type %> :<%= attribute.name %> %> </p> <% end -%> @@ -14,4 +14,4 @@ </p> <%% end %> -<%%= link_to 'Back', <%= nesting_owner %>_<%= plural_name %>_path(@<%= nesting_owner %>) %> \ No newline at end of file +<%%= link_to 'Back', <%= nesting_owner %>_<%= plural_name %>_path(@<%= nesting_owner %>) %> generators/rspec_nested_scaffold/templates/view_new.html.erb cf8f68533db4755653e099ac54a4964edaf4f4bb Paul Horsfall horsfallp@gmail.com http://github.com/phorsfall/rspec_on_rails_nested_scaffold/commit/47346461a246a366d723068b90d34bedd84a8267 47346461a246a366d723068b90d34bedd84a8267 2008-10-07T07:47:36-07:00 2008-10-07T07:47:36-07:00 Updated the view and spec templates with the latest from Rails and Rspec respectively. a822919501ba62cee28e450ecb8e29f644ac86f4 Paul Horsfall horsfallp@gmail.com