rspec-rails 2.14.2 → 6.1.0

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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 # This spec was generated by rspec-rails when you ran the scaffold generator.
 # It demonstrates how one might use RSpec to specify the controller code that
@@ -17,14 +17,25 @@ require 'spec_helper'
 # is no simpler way to get a handle on the object needed for the example.
 # Message expectations are only used when there is no simpler way to specify
 # that an instance is receiving a specific message.
+#
+# Also compared to earlier versions of this generator, there are no longer any
+# expectations of assigns and templates rendered. These features have been
+# removed from Rails core in Rails 5, but can be added back in via the
+# `rails-controller-testing` gem.
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller do
+RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:controller) %> do
 
   # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
   # adjust the attributes here as well.
-  let(:valid_attributes) { <%= formatted_hash(example_valid_attributes) %> }
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
 
   # This should return the minimal set of values that should be in the session
   # in order to pass any filters (e.g. authentication) defined in
@@ -32,135 +43,116 @@ describe <%= controller_class_name %>Controller do
   let(:valid_session) { {} }
 
 <% unless options[:singleton] -%>
-  describe "GET index" do
-    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 %>])
+  describe "GET #index" do
+    it "returns a success response" do
+      <%= class_name %>.create! valid_attributes
+      get :index, params: {}, session: valid_session
+      expect(response).to be_successful
     end
   end
 
 <% end -%>
-  describe "GET show" do
-    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+  describe "GET #show" do
+    it "returns a success response" 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 %>)
+      get :show, params: {id: <%= file_name %>.to_param}, session: valid_session
+      expect(response).to be_successful
     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 %>)
+  describe "GET #new" do
+    it "returns a success response" do
+      get :new, params: {}, session: valid_session
+      expect(response).to be_successful
     end
   end
 
-  describe "GET edit" do
-    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+  describe "GET #edit" do
+    it "returns a success response" 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 %>)
+      get :edit, params: {id: <%= file_name %>.to_param}, session: valid_session
+      expect(response).to be_successful
     end
   end
 
-  describe "POST create" do
-    describe "with valid params" do
+  describe "POST #create" do
+    context "with valid params" do
       it "creates a new <%= class_name %>" do
         expect {
-          post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+          post :create, params: {<%= singular_table_name %>: valid_attributes}, session: valid_session
         }.to change(<%= class_name %>, :count).by(1)
       end
 
-      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
-      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)
+      it "redirects to the created <%= singular_table_name %>" do
+        post :create, params: {<%= singular_table_name %>: valid_attributes}, session: valid_session
+        expect(response).to redirect_to(<%= class_name %>.last)
       end
     end
 
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" 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
-        assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+    context "with invalid params" do
+    <% if Rails.version.to_f < 7.0 %>
+      it "returns a success response (i.e. to display the 'new' template)" do
+        post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
+        expect(response).to be_successful
       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")
+    <% else %>
+      it "renders a response with 422 status (i.e. to display the 'new' template)" do
+        post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
+        expect(response).to have_http_status(:unprocessable_entity)
       end
+    <% end %>
     end
   end
 
-  describe "PUT update" do
-    describe "with valid params" do
-      it "updates the requested <%= ns_file_name %>" do
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
-        # Assuming there are no other <%= table_name %> in the database, this
-        # specifies that the <%= class_name %> created on the previous line
-        # 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) %>)
-        <%- else -%>
-        <%= class_name %>.any_instance.should_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
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
 
-      it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+      it "updates the requested <%= singular_table_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 %>)
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: new_attributes}, session: valid_session
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
       end
 
-      it "redirects to the <%= ns_file_name %>" do
+      it "redirects to the <%= singular_table_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 %>)
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: new_attributes}, session: valid_session
+        expect(response).to redirect_to(<%= file_name %>)
       end
     end
 
-    describe "with invalid params" do
-      it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+    context "with invalid params" do
+    <% if Rails.version.to_f < 7.0 %>
+      it "returns a success response (i.e. to display 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
-        assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
+        expect(response).to be_successful
       end
-
-      it "re-renders the 'edit' template" do
+    <% else %>
+      it "renders a response with 422 status (i.e. to display 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")
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
+        expect(response).to have_http_status(:unprocessable_entity)
       end
+    <% end %>
     end
   end
 
-  describe "DELETE destroy" do
-    it "destroys the requested <%= ns_file_name %>" do
+  describe "DELETE #destroy" do
+    it "destroys the requested <%= singular_table_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
-        delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+        delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
       }.to change(<%= class_name %>, :count).by(-1)
     end
 
     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)
+      delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
+      expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end
 

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

@@ -1,31 +1,27 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit" do
-  before(:each) do
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+RSpec.describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
+  let(:<%= singular_table_name %>) {
+    <%= class_name %>.create!(<%= ')' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      <%= attribute.name %>: <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-<%= output_attributes.empty? ? "" : "    ))\n" -%>
+<%= "    )\n" unless output_attributes.empty? -%>
+  }
+
+  before(:each) do
+    assign(:<%= singular_table_name %>, <%= singular_table_name %>)
   end
 
   it "renders the edit <%= ns_file_name %> form" do
     render
 
-<% if webrat? -%>
-    rendered.should have_selector("form", :action => <%= ns_file_name %>_path(@<%= ns_file_name %>), :method => "post") do |form|
+    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(<%= singular_table_name %>), "post" do
 <% for attribute in output_attributes -%>
-      form.should have_selector("<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>", :name => "<%= ns_file_name %>[<%= attribute.name %>]")
+      <%- name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name %>
+      assert_select "<%= attribute.input_type -%>[name=?]", "<%= ns_file_name %>[<%= name %>]"
 <% end -%>
     end
-<% else -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-    assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= ns_file_name %>), "post" do
-<% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>[name=?]", "<%= ns_file_name %>[<%= attribute.name %>]"
-<% end -%>
-    end
-<% end -%>
   end
 end

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

@@ -1,13 +1,13 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/index" do
+RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
   before(:each) do
     assign(:<%= table_name %>, [
 <% [1,2].each_with_index do |id, model_index| -%>
-      stub_model(<%= class_name %><%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : ',' %>
+      <%= class_name %>.create!(<%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : '' %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-        :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+        <%= attribute.name %>: <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
       <%= model_index == 1 ? ')' : '),' %>
@@ -18,15 +18,9 @@ describe "<%= ns_table_name %>/index" do
 
   it "renders a list of <%= ns_table_name %>" do
     render
-<% unless webrat? -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-<% end -%>
+    cell_selector = Rails::VERSION::STRING >= '7' ? 'div>p' : 'tr>td'
 <% for attribute in output_attributes -%>
-<% if webrat? -%>
-    rendered.should 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 -%>
+    assert_select cell_selector, text: Regexp.new(<%= value_for(attribute) %>.to_s), count: 2
 <% end -%>
   end
 end

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

@@ -1,30 +1,22 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new" do
+RSpec.describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
   before(:each) do
-    assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? ').as_new_record)' : ',' %>
+    assign(:<%= singular_table_name %>, <%= class_name %>.new(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      <%= attribute.name %>: <%= attribute.default.inspect %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-<%= !output_attributes.empty? ? "    ).as_new_record)\n  end" : "  end" %>
+<%= !output_attributes.empty? ? "    ))\n  end" : "  end" %>
 
   it "renders new <%= ns_file_name %> form" do
     render
 
-<% if webrat? -%>
-    rendered.should 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 %>]")
-<% end -%>
-    end
-<% else -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
     assert_select "form[action=?][method=?]", <%= index_helper %>_path, "post" do
 <% for attribute in output_attributes -%>
-      assert_select "<%= attribute.input_type -%>#<%= ns_file_name %>_<%= attribute.name %>[name=?]", "<%= ns_file_name %>[<%= attribute.name %>]"
+      <%- name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name %>
+      assert_select "<%= attribute.input_type -%>[name=?]", "<%= ns_file_name %>[<%= name %>]"
 <% end -%>
     end
-<% end -%>
   end
 end

data/lib/generators/rspec/scaffold/templates/request_spec.rb

@@ -0,0 +1,153 @@
+require 'rails_helper'
+
+# This spec was generated by rspec-rails when you ran the scaffold generator.
+# It demonstrates how one might use RSpec to test the controller code that
+# was generated by Rails when you ran the scaffold generator.
+#
+# It assumes that the implementation code is generated by the rails scaffold
+# generator. If you are using any extension libraries to generate different
+# controller code, this generated spec may or may not pass.
+#
+# It only uses APIs available in rails and/or rspec-rails. There are a number
+# of tools you can use to make these specs even more expressive, but we're
+# sticking to rails and rspec-rails APIs to keep things simple and stable.
+
+<% module_namespacing do -%>
+RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %> do
+  <% if mountable_engine? -%>
+    include Engine.routes.url_helpers
+  <% end -%>
+
+  # This should return the minimal set of attributes required to create a valid
+  # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
+  # adjust the attributes here as well.
+  let(:valid_attributes) {
+    skip("Add a hash of attributes valid for your model")
+  }
+
+  let(:invalid_attributes) {
+    skip("Add a hash of attributes invalid for your model")
+  }
+
+<% unless options[:singleton] -%>
+  describe "GET /index" do
+    it "renders a successful response" do
+      <%= class_name %>.create! valid_attributes
+      get <%= index_helper %>_url
+      expect(response).to be_successful
+    end
+  end
+<% end -%>
+
+  describe "GET /show" do
+    it "renders a successful response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get <%= show_helper %>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /new" do
+    it "renders a successful response" do
+      get <%= new_helper %>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "GET /edit" do
+    it "renders a successful response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get <%= edit_helper %>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST /create" do
+    context "with valid parameters" do
+      it "creates a new <%= class_name %>" do
+        expect {
+          post <%= index_helper %>_url, params: { <%= singular_table_name %>: valid_attributes }
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "redirects to the created <%= singular_table_name %>" do
+        post <%= index_helper %>_url, params: { <%= singular_table_name %>: valid_attributes }
+        expect(response).to redirect_to(<%= show_helper(class_name+".last") %>)
+      end
+    end
+
+    context "with invalid parameters" do
+      it "does not create a new <%= class_name %>" do
+        expect {
+          post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
+        }.to change(<%= class_name %>, :count).by(0)
+      end
+
+    <% if Rails.version.to_f < 7.0 %>
+      it "renders a successful response (i.e. to display the 'new' template)" do
+        post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
+        expect(response).to be_successful
+      end
+    <% else %>
+      it "renders a response with 422 status (i.e. to display the 'new' template)" do
+        post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    <% end %>
+    end
+  end
+
+  describe "PATCH /update" do
+    context "with valid parameters" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested <%= singular_table_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: new_attributes }
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "redirects to the <%= singular_table_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: new_attributes }
+        <%= file_name %>.reload
+        expect(response).to redirect_to(<%= singular_table_name %>_url(<%= file_name %>))
+      end
+    end
+
+    context "with invalid parameters" do
+    <% if Rails.version.to_f < 7.0 %>
+      it "renders a successful response (i.e. to display the 'edit' template)" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
+        expect(response).to be_successful
+      end
+    <% else %>
+      it "renders a response with 422 status (i.e. to display the 'edit' template)" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
+        expect(response).to have_http_status(:unprocessable_entity)
+      end
+    <% end %>
+    end
+  end
+
+  describe "DELETE /destroy" do
+    it "destroys the requested <%= singular_table_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+        delete <%= show_helper %>
+      }.to change(<%= class_name %>, :count).by(-1)
+    end
+
+    it "redirects to the <%= table_name %> list" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      delete <%= show_helper %>
+      expect(response).to redirect_to(<%= index_helper %>_url)
+    end
+  end
+end
+<% end -%>

data/lib/generators/rspec/scaffold/templates/routing_spec.rb

@@ -1,39 +1,46 @@
-require "spec_helper"
+require "rails_helper"
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller do
+RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:routing) %> do
   describe "routing" do
-
 <% unless options[:singleton] -%>
     it "routes to #index" do
-      get("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#index")
+      expect(get: "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#index")
     end
 
 <% end -%>
+<% unless options[:api] -%>
     it "routes to #new" do
-      get("/<%= ns_table_name %>/new").should route_to("<%= ns_table_name %>#new")
+      expect(get: "/<%= ns_table_name %>/new").to route_to("<%= ns_table_name %>#new")
     end
 
+<% end -%>
     it "routes to #show" do
-      get("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#show", :id => "1")
+      expect(get: "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#show", id: "1")
     end
 
+<% unless options[:api] -%>
     it "routes to #edit" do
-      get("/<%= ns_table_name %>/1/edit").should route_to("<%= ns_table_name %>#edit", :id => "1")
+      expect(get: "/<%= ns_table_name %>/1/edit").to route_to("<%= ns_table_name %>#edit", id: "1")
     end
 
+<% end -%>
+
     it "routes to #create" do
-      post("/<%= ns_table_name %>").should route_to("<%= ns_table_name %>#create")
+      expect(post: "/<%= ns_table_name %>").to route_to("<%= ns_table_name %>#create")
     end
 
-    it "routes to #update" do
-      put("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#update", :id => "1")
+    it "routes to #update via PUT" do
+      expect(put: "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", id: "1")
     end
 
-    it "routes to #destroy" do
-      delete("/<%= ns_table_name %>/1").should route_to("<%= ns_table_name %>#destroy", :id => "1")
+    it "routes to #update via PATCH" do
+      expect(patch: "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#update", id: "1")
     end
 
+    it "routes to #destroy" do
+      expect(delete: "/<%= ns_table_name %>/1").to route_to("<%= ns_table_name %>#destroy", id: "1")
+    end
   end
 end
 <% end -%>

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

@@ -1,11 +1,11 @@
-require 'spec_helper'
+require 'rails_helper'
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/show" do
+RSpec.describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
   before(:each) do
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, stub_model(<%= class_name %><%= output_attributes.empty? ? '))' : ',' %>
+    assign(:<%= singular_table_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
-      :<%= attribute.name %> => <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
+      <%= attribute.name %>: <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
     ))
@@ -14,15 +14,8 @@ describe "<%= ns_table_name %>/show" do
 
   it "renders attributes in <p>" do
     render
-<% unless webrat? -%>
-    # Run the generator again with the --webrat flag if you want to use webrat matchers
-<% end -%>
 <% for attribute in output_attributes -%>
-<% if webrat? -%>
-    rendered.should contain(<%= value_for(attribute) %>.to_s)
-<% else -%>
-    rendered.should match(/<%= eval(value_for(attribute)) %>/)
-<% end -%>
+    expect(rendered).to match(/<%= raw_value_for(attribute) %>/)
 <% end -%>
   end
 end

data/lib/generators/rspec/system/system_generator.rb

@@ -0,0 +1,24 @@
+require 'generators/rspec'
+
+module Rspec
+  module Generators
+    # @private
+    class SystemGenerator < Base
+      class_option :system_specs, type: :boolean, default: true,  desc: "Generate system specs"
+
+      def generate_system_spec
+        return unless options[:system_specs]
+
+        template template_name, target_path('system', class_path, filename)
+      end
+
+      def template_name
+        'system_spec.rb'
+      end
+
+      def filename
+        "#{table_name}_spec.rb"
+      end
+    end
+  end
+end

data/lib/generators/rspec/system/templates/system_spec.rb

@@ -0,0 +1,9 @@
+require 'rails_helper'
+
+RSpec.describe "<%= class_name.pluralize %>", <%= type_metatag(:system) %> do
+  before do
+    driven_by(:rack_test)
+  end
+
+  pending "add some scenarios (or delete) #{__FILE__}"
+end

data/lib/generators/rspec/view/templates/view_spec.rb

@@ -1,5 +1,5 @@
-require 'spec_helper'
+require 'rails_helper'
 
-describe "<%= file_path %>/<%= @action %>" do
+RSpec.describe "<%= file_path %>/<%= @action %>", <%= type_metatag(:view) %> do
   pending "add some examples to (or delete) #{__FILE__}"
 end