0
@@ -29,10 +29,6 @@
0
     end
0
   end
0
 
0
-  def edit
0
-    @<%= file_name %> = <%= class_name %>.find(params[:id])
0
-  end
0
-
0
   def create
0
     @<%= file_name %> = <%= class_name %>.new(params[:<%= file_name %>])
0
 
0
@@ -48,6 +44,10 @@
0
         format.json { render :json => @<%= file_name %>.errors, :status => :unprocessable_entity }
0
       end
0
     end
0
+  end
0
+
0
+  def edit
0
+    @<%= file_name %> = <%= class_name %>.find(params[:id])
0
   end
0
 
0
   def update

0
@@ -10,8 +10,8 @@
0
     <%= class_name %>.stub!(:find).with(:all).and_return(@<%= table_name %>)
0
   end
0
   
0
-  it.assigns :<%= table_name %>
0
-  it.renders :template, :index
0
+  it_assigns :<%= table_name %>
0
+  it_renders :template, :index
0
 
0
 <% %w(xml json).each do |format| 
0
 %>  describe <%= controller_class_name %>Controller, "(<%= format %>)" do
0
@@ -19,8 +19,8 @@
0
     
0
     act! { get :index, :format => '<%= format %>' }
0
 
0
-    it.assigns :<%= table_name %>
0
-    it.renders :<%= format %>, :<%= table_name %>
0
+    it_assigns :<%= table_name %>
0
+    it_renders :<%= format %>, :<%= table_name %>
0
   end
0
 
0
 <% end %>
0
@@ -36,8 +36,8 @@
0
     <%= class_name %>.stub!(:find).with('1').and_return(@<%= file_name %>)
0
   end
0
   
0
-  it.assigns :<%= file_name %>
0
-  it.renders :template, :show
0
+  it_assigns :<%= file_name %>
0
+  it_renders :template, :show
0
   
0
 <% %w(xml json).each do |format| 
0
 %>  describe <%= controller_class_name %>Controller, "(<%= format %>)" do
0
@@ -45,7 +45,7 @@
0
     
0
     act! { get :show, :id => 1, :format => '<%= format %>' }
0
 
0
-    it.renders :<%= format %>, :<%= file_name %>
0
+    it_renders :<%= format %>, :<%= file_name %>
0
   end
0
 
0
 <% end %>
0
0
0
@@ -63,32 +63,19 @@
0
     assigns[:<%= file_name %>].should be_new_record
0
   end
0
   
0
-  it.renders :template, :new
0
+  it_renders :template, :new
0
   
0
 <% %w(xml json).each do |format| 
0
 %>  describe <%= controller_class_name %>Controller, "(<%= format %>)" do
0
     # fixture definition
0
     act! { get :new, :format => '<%= format %>' }
0
 
0
-    it.renders :<%= format %>, :<%= file_name %>
0
+    it_renders :<%= format %>, :<%= file_name %>
0
   end
0
 
0
 <% end %>
0
 end
0
 
0
-describe <%= controller_class_name %>Controller, "GET #edit" do
0
-  # fixture definition
0
-  act! { get :edit, :id => 1 }
0
-  
0
-  before do
0
-    @<%= file_name %>  = <%= table_name %>(:default)
0
-    <%= class_name %>.stub!(:find).with('1').and_return(@<%= file_name %>)
0
-  end
0
-
0
-  it.assigns :<%= file_name %>
0
-  it.renders :template, :edit
0
-end
0
-
0
 describe <%= controller_class_name %>Controller, "POST #create" do
0
   before do
0
     @attributes = {}
0
@@ -104,8 +91,8 @@
0
       @<%= file_name %>.stub!(:save).and_return(true)
0
     end
0
     
0
-    it.assigns :<%= file_name %>, :flash => { :notice => :not_nil }
0
-    it.redirects_to { <%= file_name %>_path(@<%= file_name %>) }
0
+    it_assigns :<%= file_name %>, :flash => { :notice => :not_nil }
0
+    it_redirects_to { <%= file_name %>_path(@<%= file_name %>) }
0
   end
0
 
0
   describe <%= controller_class_name %>Controller, "(unsuccessful creation)" do
0
@@ -116,8 +103,8 @@
0
       @<%= file_name %>.stub!(:save).and_return(false)
0
     end
0
     
0
-    it.assigns :<%= file_name %>
0
-    it.renders :template, :new
0
+    it_assigns :<%= file_name %>
0
+    it_renders :template, :new
0
   end
0
   
0
 <% %w(xml json).each do |format| 
0
@@ -130,8 +117,8 @@
0
       @<%= file_name %>.stub!(:to_<%= format %>).and_return("mocked content")
0
     end
0
     
0
-    it.assigns :<%= file_name %>, :headers => { :Location => lambda { <%= file_name %>_url(@<%= file_name %>) } }
0
-    it.renders :<%= format %>, :<%= file_name %>, :status => :created
0
+    it_assigns :<%= file_name %>, :headers => { :Location => lambda { <%= file_name %>_url(@<%= file_name %>) } }
0
+    it_renders :<%= format %>, :<%= file_name %>, :status => :created
0
   end
0
   
0
   describe <%= controller_class_name %>Controller, "(unsuccessful creation, <%= format %>)" do
0
0
@@ -142,12 +129,25 @@
0
       @<%= file_name %>.stub!(:save).and_return(false)
0
     end
0
     
0
-    it.assigns :<%= file_name %>
0
-    it.renders :<%= format %>, "<%= file_name %>.errors", :status => :unprocessable_entity
0
+    it_assigns :<%= file_name %>
0
+    it_renders :<%= format %>, "<%= file_name %>.errors", :status => :unprocessable_entity
0
   end
0
 
0
 <% end %>end
0
 
0
+describe <%= controller_class_name %>Controller, "GET #edit" do
0
+  # fixture definition
0
+  act! { get :edit, :id => 1 }
0
+  
0
+  before do
0
+    @<%= file_name %>  = <%= table_name %>(:default)
0
+    <%= class_name %>.stub!(:find).with('1').and_return(@<%= file_name %>)
0
+  end
0
+
0
+  it_assigns :<%= file_name %>
0
+  it_renders :template, :edit
0
+end
0
+
0
 describe <%= controller_class_name %>Controller, "PUT #update" do
0
   before do
0
     @attributes = {}
0
@@ -163,8 +163,8 @@
0
       @<%= file_name %>.stub!(:save).and_return(true)
0
     end
0
     
0
-    it.assigns :<%= file_name %>, :flash => { :notice => :not_nil }
0
-    it.redirects_to { <%= file_name %>_path(@<%= file_name %>) }
0
+    it_assigns :<%= file_name %>, :flash => { :notice => :not_nil }
0
+    it_redirects_to { <%= file_name %>_path(@<%= file_name %>) }
0
   end
0
 
0
   describe <%= controller_class_name %>Controller, "(unsuccessful save)" do
0
@@ -175,8 +175,8 @@
0
       @<%= file_name %>.stub!(:save).and_return(false)
0
     end
0
     
0
-    it.assigns :<%= file_name %>
0
-    it.renders :template, :edit
0
+    it_assigns :<%= file_name %>
0
+    it_renders :template, :edit
0
   end
0
   
0
 <% %w(xml json).each do |format| 
0
@@ -188,8 +188,8 @@
0
       @<%= file_name %>.stub!(:save).and_return(true)
0
     end
0
     
0
-    it.assigns :<%= file_name %>
0
-    it.renders :blank
0
+    it_assigns :<%= file_name %>
0
+    it_renders :blank
0
   end
0
   
0
   describe <%= controller_class_name %>Controller, "(unsuccessful save, <%= format %>)" do
0
@@ -200,8 +200,8 @@
0
       @<%= file_name %>.stub!(:save).and_return(false)
0
     end
0
     
0
-    it.assigns :<%= file_name %>
0
-    it.renders :<%= format %>, "<%= file_name %>.errors", :status => :unprocessable_entity
0
+    it_assigns :<%= file_name %>
0
+    it_renders :<%= format %>, "<%= file_name %>.errors", :status => :unprocessable_entity
0
   end
0
 
0
 <% end %>end
0
0
@@ -216,16 +216,16 @@
0
     <%= class_name %>.stub!(:find).with('1').and_return(@<%= file_name %>)
0
   end
0
 
0
-  it.assigns :<%= file_name %>
0
-  it.redirects_to { <%= table_name %>_path }
0
+  it_assigns :<%= file_name %>
0
+  it_redirects_to { <%= table_name %>_path }
0
   
0
 <% %w(xml json).each do |format| 
0
 %>  describe <%= controller_class_name %>Controller, "(<%= format %>)" do
0
     # fixture definition
0
     act! { delete :destroy, :id => 1, :format => '<%= format %>' }
0
 
0
-    it.assigns :<%= file_name %>
0
-    it.renders :blank
0
+    it_assigns :<%= file_name %>
0
+    it_renders :blank
0
   end
0
 
0
 <% end %>