@@ -7,72 +7,41 @@ describe <%= controller_class_name %>Controller do end describe "GET index" do - - it "exposes all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do + it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do <%= class_name %>.should_receive(:find).with(:all).and_return([mock_<%= file_name %>]) get :index assigns[:<%= table_name %>].should == [mock_<%= file_name %>] end - - describe "with mime type of xml" do - - it "renders all <%= table_name.pluralize %> as xml" do - <%= class_name %>.should_receive(:find).with(:all).and_return(<%= file_name.pluralize %> = mock("Array of <%= class_name.pluralize %>")) - <%= file_name.pluralize %>.should_receive(:to_xml).and_return("generated XML") - get :index, :format => 'xml' - response.body.should == "generated XML" - end - - end - end describe "GET show" do - - it "exposes the requested <%= file_name %> as @<%= file_name %>" do + it "assigns the requested <%= file_name %> as @<%= file_name %>" do <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) get :show, :id => "37" assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - - describe "with mime type of xml" do - - it "renders the requested <%= file_name %> as xml" do - <%= class_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", :format => 'xml' - response.body.should == "generated XML" - end - - end - end describe "GET new" do - - it "exposes a new <%= file_name %> as @<%= file_name %>" do + it "assigns a new <%= file_name %> as @<%= file_name %>" do <%= class_name %>.should_receive(:new).and_return(mock_<%= file_name %>) get :new assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - end describe "GET edit" do - - it "exposes the requested <%= file_name %> as @<%= file_name %>" do + it "assigns the requested <%= file_name %> as @<%= file_name %>" do <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) get :edit, :id => "37" assigns[:<%= file_name %>].should equal(mock_<%= file_name %>) end - end describe "POST create" do - + describe "with valid params" do - - it "exposes a newly created <%= file_name %> as @<%= file_name %>" do + it "assigns a newly created <%= file_name %> as @<%= file_name %>" do <%= class_name %>.should_receive(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => true)) post :create, :<%= file_name %> => {:these => 'params'} assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) @@ -83,12 +52,10 @@ describe <%= controller_class_name %>Controller do post :create, :<%= file_name %> => {} response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>)) end - end describe "with invalid params" do - - it "exposes a newly created but unsaved <%= file_name %> as @<%= file_name %>" do + it "assigns a newly created but unsaved <%= file_name %> as @<%= file_name %>" do <%= class_name %>.stub!(:new).with({'these' => 'params'}).and_return(mock_<%= file_name %>(:save => false)) post :create, :<%= file_name %> => {:these => 'params'} assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) @@ -99,22 +66,20 @@ describe <%= controller_class_name %>Controller do post :create, :<%= file_name %> => {} response.should render_template('new') end - end end describe "PUT udpate" do - + describe "with valid params" do - it "updates the requested <%= file_name %>" do <%= class_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'} end - it "exposes the requested <%= file_name %> as @<%= file_name %>" do + it "assigns the requested <%= file_name %> as @<%= file_name %>" do <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => true)) put :update, :id => "1" assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) @@ -125,18 +90,16 @@ describe <%= controller_class_name %>Controller do put :update, :id => "1" response.should redirect_to(<%= table_name.singularize %>_url(mock_<%= file_name %>)) end - end describe "with invalid params" do - it "updates the requested <%= file_name %>" do <%= class_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'} end - it "exposes the <%= file_name %> as @<%= file_name %>" do + it "assigns the <%= file_name %> as @<%= file_name %>" do <%= class_name %>.stub!(:find).and_return(mock_<%= file_name %>(:update_attributes => false)) put :update, :id => "1" assigns(:<%= file_name %>).should equal(mock_<%= file_name %>) @@ -147,13 +110,11 @@ describe <%= controller_class_name %>Controller do put :update, :id => "1" response.should render_template('edit') end - end - + end describe "DELETE destroy" do - it "destroys the requested <%= file_name %>" do <%= class_name %>.should_receive(:find).with("37").and_return(mock_<%= file_name %>) mock_<%= file_name %>.should_receive(:destroy) @@ -165,7 +126,6 @@ describe <%= controller_class_name %>Controller do delete :destroy, :id => "1" response.should redirect_to(<%= table_name %>_url) end - end end generators/rspec_scaffold/templates/controller_spec.rb 2ddd3f2ff27b1354b4a7c12158cb1bbfc4e0b24b David Chelimsky dchelimsky@gmail.com http://github.com/dchelimsky/rspec-rails/commit/3dfe273b90311ea35d51400385caf51de90323f2 3dfe273b90311ea35d51400385caf51de90323f2 2009-04-04T06:37:04-07:00 2009-04-04T06:37:04-07:00 simplify generated controller spec 4beebedf76cc5b1658aaed307ba4ec0f5e39934a David Chelimsky dchelimsky@gmail.com