Generators use newer expect syntax

Closes #839

Author: alindeman

lib/generators/rspec/controller/templates/controller_spec.rb

@@ -7,7 +7,7 @@
   describe "GET '<%= action %>'" do
     it "returns http success" do
       get '<%= action %>'
-      response.should be_success
+      expect(response).to be_success
     end
   end
 

lib/generators/rspec/integration/templates/request_spec.rb

@@ -9,7 +9,7 @@
       # Run the generator again with the --webrat flag if you want to use webrat methods/matchers
       get <%= index_helper %>_path
 <% end -%>
-      response.status.should be(200)
+      expect(response.status).to be(200)
     end
   end
 end

lib/generators/rspec/mailer/templates/mailer_spec.rb

@@ -7,13 +7,13 @@
     let(:mail) { <%= class_name %>.<%= action %> }
 
     it "renders the headers" do
-      mail.subject.should eq(<%= action.to_s.humanize.inspect %>)
-      mail.to.should eq(["[email protected]"])
-      mail.from.should eq(["[email protected]"])
+      expect(mail.subject).to eq(<%= action.to_s.humanize.inspect %>)
+      expect(mail.to).to eq(["[email protected]"])
+      expect(mail.from).to eq(["[email protected]"])
     end
 
     it "renders the body" do
-      mail.body.encoded.should match("Hi")
+      expect(mail.body.encoded).to match("Hi")
     end
   end
 

lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -36,7 +36,7 @@
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :index, {}, valid_session
-      assigns(:<%= table_name %>).should eq([<%= file_name %>])
+      expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
     end
   end
 
@@ -45,22 +45,22 @@
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :show, {:id => <%= file_name %>.to_param}, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
   describe "GET new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
       get :new, {}, valid_session
-      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
     end
   end
 
   describe "GET edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       get :edit, {:id => <%= file_name %>.to_param}, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+      expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
@@ -74,13 +74,13 @@
 
       it "assigns a newly created <%= ns_file_name %> as @<%= ns_file_name %>" do
         post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-        assigns(:<%= ns_file_name %>).should be_a(<%= class_name %>)
-        assigns(:<%= ns_file_name %>).should be_persisted
+        expect(assigns(:<%= ns_file_name %>)).to be_a(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_persisted
       end
 
       it "redirects to the created <%= ns_file_name %>" do
         post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-        response.should redirect_to(<%= class_name %>.last)
+        expect(response).to redirect_to(<%= class_name %>.last)
       end
     end
 
@@ -89,14 +89,14 @@
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         post :create, {:<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        response.should render_template("new")
+        expect(response).to render_template("new")
       end
     end
   end
@@ -110,23 +110,23 @@
         # receives the :update_attributes message with whatever params are
         # submitted in the request.
         <%- if ::Rails::VERSION::STRING >= '4' -%>
-        <%= class_name %>.any_instance.should_receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
+        expect_any_instance_of(<%= class_name %>).to receive(:update).with(<%= formatted_hash(example_params_for_update) %>)
         <%- else -%>
-        <%= class_name %>.any_instance.should_receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
+        expect_any_instance_of(<%= class_name %>).to receive(:update_attributes).with(<%= formatted_hash(example_params_for_update) %>)
         <%- end -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_params_for_update) %>}, valid_session
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
-        response.should redirect_to(<%= file_name %>)
+        expect(response).to redirect_to(<%= file_name %>)
       end
     end
 
@@ -136,15 +136,15 @@
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         # Trigger the behavior that occurs when invalid params are submitted
         <%= class_name %>.any_instance.stub(:save).and_return(false)
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => <%= formatted_hash(example_invalid_attributes) %>}, valid_session
-        response.should render_template("edit")
+        expect(response).to render_template("edit")
       end
     end
   end
@@ -160,7 +160,7 @@
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
-      response.should redirect_to(<%= index_helper %>_url)
+      expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end
 

lib/generators/rspec/scaffold/templates/edit_spec.rb

@@ -14,9 +14,9 @@
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
+    expect(rendered).to have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+      expect(form).to have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
 <% else -%>

lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -23,7 +23,7 @@
 <% end -%>
 <% for attribute in output_attributes -%>
 <% if webrat? -%>
-    rendered.should have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
+    expect(rendered).to have_selector("tr>td", :content => <%= value_for(attribute) %>.to_s, :count => 2)
 <% else -%>
     assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => 2
 <% end -%>

lib/generators/rspec/scaffold/templates/new_spec.rb

@@ -13,9 +13,9 @@
     render
 
 <% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
+    expect(rendered).to have_selector("form", :action => <%= table_name %>_path, :method => "post") do |form|
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+      expect(form).to have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
 <% end -%>
     end
 <% else -%>

lib/generators/rspec/scaffold/templates/show_spec.rb

@@ -19,9 +19,9 @@
 <% end -%>
 <% for attribute in output_attributes -%>
 <% if webrat? -%>
-    rendered.should contain(<%= value_for(attribute) %>.to_s)
+    expect(rendered).to contain(<%= value_for(attribute) %>.to_s)
 <% else -%>
-    rendered.should match(/<%= eval(value_for(attribute)) %>/)
+    expect(rendered).to match(/<%= eval(value_for(attribute)) %>/)
 <% end -%>
 <% end -%>
   end