clarify assignments in generated view specs

rspec · Jun 19, 2010 · 0d244a1 · 0d244a1
1 parent 3def656
commit 0d244a1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/generators/rspec/scaffold/templates/edit_spec.rb b/lib/generators/rspec/scaffold/templates/edit_spec.rb
@@ -3,7 +3,7 @@
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/edit.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %>,
+    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %>,
       :new_record? => false<%= output_attributes.empty? ? '' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>

diff --git a/lib/generators/rspec/scaffold/templates/show_spec.rb b/lib/generators/rspec/scaffold/templates/show_spec.rb
@@ -3,7 +3,7 @@
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
 describe "<%= table_name %>/show.html.<%= options[:template_engine] %>" do
   before(:each) do
-    assign(:<%= file_name %>, @<%= file_name %> = stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    @<%= file_name %> = assign(:<%= file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
@@ -15,7 +15,7 @@
   it "renders attributes in <p>" do
     render
 <% for attribute in output_attributes -%>
-   rendered.should contain(<%= attribute.default.inspect %>)
+    rendered.should contain(<%= attribute.default.inspect %>)
 <% end -%>
   end
 end