rspec-rails 2.14.2 → 3.9.1

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -3,6 +3,7 @@ require 'rails/generators/resource_helpers'
 
 module Rspec
   module Generators
+    # @private
     class ScaffoldGenerator < Base
       include ::Rails::Generators::ResourceHelpers
       source_paths << File.expand_path("../../helper/templates", __FILE__)
@@ -11,22 +12,35 @@ module Rspec
       class_option :orm, :desc => "ORM used to generate the controller"
       class_option :template_engine, :desc => "Template engine to generate view files"
       class_option :singleton, :type => :boolean, :desc => "Supply to create a singleton controller"
+      class_option :api, :type => :boolean, :desc => "Skip specs unnecessary for API-only apps"
 
       class_option :controller_specs, :type => :boolean, :default => true,  :desc => "Generate controller specs"
       class_option :view_specs,       :type => :boolean, :default => true,  :desc => "Generate view specs"
-      class_option :webrat,           :type => :boolean, :default => false, :desc => "Use webrat methods/matchers"
-      class_option :webrat_matchers,  :type => :boolean, :default => false, :desc => "Use webrat methods/matchers (deprecated - use --webrat)"
       class_option :helper_specs,     :type => :boolean, :default => true,  :desc => "Generate helper specs"
       class_option :routing_specs,    :type => :boolean, :default => true,  :desc => "Generate routing specs"
 
+      def initialize(*args, &blk)
+        @generator_args = args.first
+        super(*args, &blk)
+      end
+
       def generate_controller_spec
         return unless options[:controller_specs]
 
-        template 'controller_spec.rb',
-                 File.join('spec/controllers', controller_class_path, "#{controller_file_name}_controller_spec.rb")
+        template_file = File.join(
+          'spec/controllers',
+          controller_class_path,
+          "#{controller_file_name}_controller_spec.rb"
+        )
+        if options[:api]
+          template 'api_controller_spec.rb', template_file
+        else
+          template 'controller_spec.rb', template_file
+        end
       end
 
       def generate_view_specs
+        return if options[:api]
         return unless options[:view_specs] && options[:template_engine]
 
         copy_view :edit
@@ -38,155 +52,71 @@ module Rspec
       def generate_routing_spec
         return unless options[:routing_specs]
 
-        template 'routing_spec.rb',
-          File.join('spec/routing', controller_class_path, "#{controller_file_name}_routing_spec.rb")
+        template_file = File.join(
+          'spec/routing',
+          controller_class_path,
+          "#{controller_file_name}_routing_spec.rb"
+        )
+        template 'routing_spec.rb', template_file
       end
 
       hook_for :integration_tool, :as => :integration
 
-      protected
+    protected
 
-        # @deprecated Use `--webrat` instead.
-        def webrat?
-          RSpec.deprecate("--webrat-matchers", :replacement => "--webrat") if options[:webrat_matchers]
-          options[:webrat] || options[:webrat_matchers]
-        end
+      attr_reader :generator_args
 
-        def copy_view(view)
-          template "#{view}_spec.rb",
-                   File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
-        end
-
-        def example_valid_attributes
-          # Only take the first attribute so this hash does not become unweildy and large in the
-          # generated controller spec. It is the responsibility of the user to keep the the valid
-          # attributes method up-to-date as they add validations.
-          @example_valid_attributes ||=
-            if attributes.any?
-              { attributes.first.name => attributes.first.default.to_s }
-            else
-              { }
-            end
-        end
-
-        def example_invalid_attributes
-          @example_invalid_attributes ||=
-            if attributes.any?
-              { attributes.first.name => "invalid value" }
-            else
-              { }
-            end
-        end
-
-        def example_params_for_update
-          @example_params_for_update ||=
-            if example_valid_attributes.any?
-              example_valid_attributes
-            else
-              { "these" => "params" }
-            end
-        end
-
-        def formatted_hash(hash)
-          formatted = hash.inspect
-          formatted.gsub!("{", "{ ")
-          formatted.gsub!("}", " }")
-          formatted.gsub!("=>", " => ")
-          formatted
-        end
-
-        # support for namespaced-resources
-        def ns_file_name
-          ns_parts.empty? ? file_name : "#{ns_parts[0].underscore}_#{ns_parts[1].singularize.underscore}"
-        end
-
-        # support for namespaced-resources
-        def ns_table_name
-          ns_parts.empty? ? table_name : "#{ns_parts[0].underscore}/#{ns_parts[1].tableize}"
-        end
-
-        def ns_parts
-          @ns_parts ||= begin
-                          matches = ARGV[0].to_s.match(/\A(\w+)(?:\/|::)(\w+)/)
-                          matches ? [matches[1], matches[2]] : []
-                        end
-        end
+      def copy_view(view)
+        template "#{view}_spec.rb",
+                 File.join("spec/views", controller_file_path, "#{view}.html.#{options[:template_engine]}_spec.rb")
+      end
 
-        # Returns the name of the mock. For example, if the file name is user,
-        # it returns mock_user.
-        #
-        # If a hash is given, it uses the hash key as the ORM method and the
-        # value as response. So, for ActiveRecord and file name "User":
-        #
-        #   mock_file_name(:save => true)
-        #   #=> mock_user(:save => true)
-        #
-        # If another ORM is being used and another method instead of save is
-        # called, it will be the one used.
-        #
-        def mock_file_name(hash=nil)
-          if hash
-            method, and_return = hash.to_a.first
-            method = orm_instance.send(method).split('.').last.gsub(/\(.*?\)/, '')
-            "mock_#{ns_file_name}(:#{method} => #{and_return})"
-          else
-            "mock_#{ns_file_name}"
-          end
-        end
+      # support for namespaced-resources
+      def ns_file_name
+        return file_name if ns_parts.empty?
+        "#{ns_prefix.map(&:underscore).join('/')}_#{ns_suffix.singularize.underscore}"
+      end
 
-        # Receives the ORM chain and convert to expects. For ActiveRecord:
-        #
-        #   should! orm_class.find(User, "37")
-        #   #=> User.should_receive(:find).with(37)
-        #
-        # For Datamapper:
-        #
-        #   should! orm_class.find(User, "37")
-        #   #=> User.should_receive(:get).with(37)
-        #
-        def should_receive(chain)
-          stub_or_should_chain(:should_receive, chain)
-        end
+      # support for namespaced-resources
+      def ns_table_name
+        return table_name if ns_parts.empty?
+        "#{ns_prefix.map(&:underscore).join('/')}/#{ns_suffix.tableize}"
+      end
 
-        # Receives the ORM chain and convert to stub. For ActiveRecord:
-        #
-        #   stub orm_class.find(User, "37")
-        #   #=> User.stub(:find).with(37)
-        #
-        # For Datamapper:
-        #
-        #   stub orm_class.find(User, "37")
-        #   #=> User.stub(:get).with(37)
-        #
-        def stub(chain)
-          stub_or_should_chain(:stub, chain)
-        end
+      def ns_parts
+        @ns_parts ||= begin
+                        parts = generator_args[0].split(/\/|::/)
+                        parts.size > 1 ? parts : []
+                      end
+      end
 
-        def stub_or_should_chain(mode, chain)
-          receiver, method = chain.split(".")
-          method.gsub!(/\((.*?)\)/, '')
+      def ns_prefix
+        @ns_prefix ||= ns_parts[0..-2]
+      end
 
-          response = "#{receiver}.#{mode}(:#{method})"
-          response << ".with(#{$1})" unless $1.blank?
-          response
-        end
+      def ns_suffix
+        @ns_suffix ||= ns_parts[-1]
+      end
 
-        def value_for(attribute)
-          case attribute.type
-          when :string
-            "#{attribute.name.titleize}".inspect
-          when :integer
-            @attribute_id_map ||= {}
-            @attribute_id_map[attribute] ||= @attribute_id_map.keys.size.next.to_s
-          else
-            attribute.default.inspect
-          end
-        end
+      def value_for(attribute)
+        raw_value_for(attribute).inspect
+      end
 
-        def banner
-          self.class.banner
+      def raw_value_for(attribute)
+        case attribute.type
+        when :string
+          attribute.name.titleize
+        when :integer, :float
+          @attribute_id_map ||= {}
+          @attribute_id_map[attribute] ||= @attribute_id_map.keys.size.next + attribute.default
+        else
+          attribute.default
         end
+      end
 
+      def banner
+        self.class.banner
+      end
     end
   end
 end

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

@@ -0,0 +1,165 @@
+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
+# 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.
+#
+# Compared to earlier versions of this generator, there is very limited use of
+# stubs and message expectations in this spec.  Stubs are only used when there
+# 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 -%>
+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) {
+    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
+  # <%= controller_class_name %>Controller. Be sure to keep this updated too.
+  let(:valid_session) { {} }
+
+<% unless options[:singleton] -%>
+  describe "GET #index" do
+    it "returns a success response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if RUBY_VERSION < '1.9.3' -%>
+      get :index, {}, valid_session
+<% else -%>
+      get :index, params: {}, session: valid_session
+<% end -%>
+      expect(response).to be_successful
+    end
+  end
+
+<% end -%>
+  describe "GET #show" do
+    it "returns a success response" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if RUBY_VERSION < '1.9.3' -%>
+      get :show, {:id => <%= file_name %>.to_param}, valid_session
+<% else -%>
+      get :show, params: {id: <%= file_name %>.to_param}, session: valid_session
+<% end -%>
+      expect(response).to be_successful
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new <%= class_name %>" do
+        expect {
+<% if RUBY_VERSION < '1.9.3' -%>
+          post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+<% else -%>
+          post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
+<% end -%>
+        }.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "renders a JSON response with the new <%= ns_file_name %>" do
+<% if RUBY_VERSION < '1.9.3' -%>
+        post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+<% else %>
+        post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
+<% end -%>
+        expect(response).to have_http_status(:created)
+        expect(response.content_type).to eq('application/json')
+        expect(response.location).to eq(<%= ns_file_name %>_url(<%= class_name %>.last))
+      end
+    end
+
+    context "with invalid params" do
+      it "renders a JSON response with errors for the new <%= ns_file_name %>" do
+<% if RUBY_VERSION < '1.9.3' -%>
+        post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
+<% else %>
+        post :create, params: {<%= ns_file_name %>: invalid_attributes}, session: valid_session
+<% end -%>
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.content_type).to eq('application/json')
+      end
+    end
+  end
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) {
+        skip("Add a hash of attributes valid for your model")
+      }
+
+      it "updates the requested <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => new_attributes}, valid_session
+<% else -%>
+        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, session: valid_session
+<% end -%>
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
+      end
+
+      it "renders a JSON response with the <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
+<% else %>
+        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, session: valid_session
+<% end -%>
+        expect(response).to have_http_status(:ok)
+        expect(response.content_type).to eq('application/json')
+      end
+    end
+
+    context "with invalid params" do
+      it "renders a JSON response with errors for the <%= ns_file_name %>" do
+        <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
+<% else %>
+        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, session: valid_session
+<% end -%>
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(response.content_type).to eq('application/json')
+      end
+    end
+  end
+
+  describe "DELETE #destroy" do
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      expect {
+<% if RUBY_VERSION < '1.9.3' -%>
+        delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+<% else -%>
+        delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
+<% end -%>
+      }.to change(<%= class_name %>, :count).by(-1)
+    end
+  end
+
+end
+<% end -%>

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,149 @@ 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
+  describe "GET #index" do
+    it "returns a success response" do
+      <%= class_name %>.create! valid_attributes
+<% if Rails::VERSION::STRING < '5.0' -%>
       get :index, {}, valid_session
-      assigns(:<%= table_name %>).should eq([<%= file_name %>])
+<% else -%>
+      get :index, params: {}, session: valid_session
+<% end -%>
+      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
+<% if Rails::VERSION::STRING < '5.0' -%>
       get :show, {:id => <%= file_name %>.to_param}, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+<% else -%>
+      get :show, params: {id: <%= file_name %>.to_param}, session: valid_session
+<% end -%>
+      expect(response).to be_successful
     end
   end
 
-  describe "GET new" do
-    it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
+  describe "GET #new" do
+    it "returns a success response" do
+<% if Rails::VERSION::STRING < '5.0' -%>
       get :new, {}, valid_session
-      assigns(:<%= ns_file_name %>).should be_a_new(<%= class_name %>)
+<% else -%>
+      get :new, params: {}, session: valid_session
+<% end -%>
+      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
+<% if Rails::VERSION::STRING < '5.0' -%>
       get :edit, {:id => <%= file_name %>.to_param}, valid_session
-      assigns(:<%= ns_file_name %>).should eq(<%= file_name %>)
+<% else -%>
+      get :edit, params: {id: <%= file_name %>.to_param}, session: valid_session
+<% end -%>
+      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 {
+<% if Rails::VERSION::STRING < '5.0' -%>
           post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
+<% else -%>
+          post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
+<% end -%>
         }.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
+<% if Rails::VERSION::STRING < '5.0' -%>
         post :create, {:<%= ns_file_name %> => valid_attributes}, valid_session
-        response.should redirect_to(<%= class_name %>.last)
+<% else -%>
+        post :create, params: {<%= ns_file_name %>: valid_attributes}, session: valid_session
+<% end -%>
+        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 %>)
-      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")
+    context "with invalid params" do
+      it "returns a success response (i.e. to display the 'new' template)" do
+<% if Rails::VERSION::STRING < '5.0' -%>
+        post :create, {:<%= ns_file_name %> => invalid_attributes}, valid_session
+<% else -%>
+        post :create, params: {<%= ns_file_name %>: invalid_attributes}, session: valid_session
+<% end -%>
+        expect(response).to be_successful
       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 <%= 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 %>)
+<% if Rails::VERSION::STRING < '5.0' -%>
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => new_attributes}, valid_session
+<% else -%>
+        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, session: valid_session
+<% end -%>
+        <%= file_name %>.reload
+        skip("Add assertions for updated state")
       end
 
       it "redirects to the <%= ns_file_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if Rails::VERSION::STRING < '5.0' -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
-        response.should redirect_to(<%= file_name %>)
+<% else -%>
+        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, session: valid_session
+<% end -%>
+        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
-        <%= 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 %>)
-      end
-
-      it "re-renders the 'edit' template" do
+    context "with invalid params" do
+      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
-        response.should render_template("edit")
+<% if Rails::VERSION::STRING < '5.0' -%>
+        put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes}, valid_session
+<% else -%>
+        put :update, params: {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, session: valid_session
+<% end -%>
+        expect(response).to be_successful
       end
     end
   end
 
-  describe "DELETE destroy" do
+  describe "DELETE #destroy" do
     it "destroys the requested <%= ns_file_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
+<% if Rails::VERSION::STRING < '5.0' -%>
         delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
+<% else -%>
+        delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
+<% end -%>
       }.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% if Rails::VERSION::STRING < '5.0' -%>
       delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
-      response.should redirect_to(<%= index_helper %>_url)
+<% else -%>
+      delete :destroy, params: {id: <%= file_name %>.to_param}, session: valid_session
+<% end -%>
+      expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end