rspec_rails_scaffold_templates 1.2.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb9fa57cda2a4744edffadd02b61ef86bce7bfd1
-  data.tar.gz: 6e2ce7300fc7e1ac7789e5ef0036ee02a55515fc
+  metadata.gz: ebde8fc9113ac7c8adaaf8ab48b726da504e6fba
+  data.tar.gz: 7d8320c70281539067cc096656b2cbb15342f20b
 SHA512:
-  metadata.gz: 7d706be391e38d4f159732aef7144712b14de373a759d292fe40d51a2077aa889fda41c77082f4a0aece3bedd14f75c7426ad1c07ae18b912bb4df130dc52efa
-  data.tar.gz: 32962541aee92043cf1aa1b4fca0409dc9621049a76f408033ef6ff292a3d3d9cd89021ddaf1c653467ac839c9225da985e86e16b95fb39a222be509e0478ac9
+  metadata.gz: d519b0a14c7f345c797e8dcdf363bb5e7de0a2bc902919d816729c85a03042087a45b03623760cd6933de392251297077f47a036088ec8390156d740c2bbca87
+  data.tar.gz: ab2ed8392fdbb3edbeb37ab0bbfe03c346b4f9e62f1ee8d0ca983e9b3abbfe702c2b49bf58621042ccc21c78af62a09be75b5803a39f3023be107cead0d25881

data/VERSION

@@ -1 +1 @@
-1.2.5
+2.0.0

data/lib/rspec_rails_scaffold_templates.rb

@@ -1,7 +1 @@
-module RspecRailsScaffoldTemplates
-  class Railtie < Rails::Railtie
-    config.app_generators do |g|
-      g.templates.unshift File::expand_path('../templates', __FILE__)
-    end 
-  end
-end
+require 'rspec_rails_scaffold_templates/railties' if defined?(Rails)

data/lib/rspec_rails_scaffold_templates/generators/scaffold_generator.rb

@@ -0,0 +1,28 @@
+require 'generators/rspec'
+require 'rails/generators/resource_helpers'
+
+module Rspec
+  module Generators
+    class ScaffoldGenerator < Base
+      class_option :with_api, type: :boolean,
+                        desc: "Generates also API controller in 'app/contorllers/api'"
+      class_option :api_version, type: :string,
+                        desc: "Adds specified path as version to 'app/contorllers/api'"
+
+      def generate_api_controller_spec
+        return unless options[:controller_specs]
+        return unless options[:with_api]
+
+        source_paths.unshift File.expand_path('../templates/rspec/scaffold/', __FILE__)
+        path = [
+          'spec/controllers/api',
+          options[:api_version],
+          controller_class_path,
+          "#{controller_file_name}_controller_spec.rb"
+        ].compact
+        template_file = File.join *path
+        template 'api_controller_spec.rb', template_file
+      end
+    end
+  end
+end

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

@@ -0,0 +1,263 @@
+<% if File.exist?(File.join %w[spec rails_helper.rb]) -%>
+require 'rails_helper'
+<% else -%>
+require 'spec_helper'
+<% end -%>
+
+<% module_namespacing do -%>
+describe Api::<%= options[:api_version].camelcase + '::' if options[:api_version].present? %><%= controller_class_name %>Controller, <%= type_metatag(:controller) %> do
+<% if method = Rails.application.config.generators.options[:rails][:cancan] -%>
+<% method = 'current_user' unless Symbol === method -%>
+  before :each do
+    allow(controller).to receive(:<%=method%>).and_return(<%=method%>)
+  end
+
+<% 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. The list could not be empty.
+<% links = attributes.select{|a| [:belongs_to, :references].include? a.type} -%>
+<% attribute = (attributes - links).detect{|a| a.name == 'name' || a.name == 'title' || a.name == 'code' || a.name =~ /name/ || a.name =~ /title/} || attributes.first -%>
+<% attribute_name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
+<% factory_girl = true -%>
+  let(:<%= file_name %>) {create :<%= file_name %>}
+
+<% if links.present? -%>
+  let(:valid_attributes) do
+    FactoryGirl.attributes_for(:<%=file_name%>)
+      .slice(*%w[<%= attribute_name %>].map(&:to_sym))
+      .merge(
+<% links.each do |relation| -%>
+        <%= relation.name %>_id: create(:<%= relation.name %>).id,
+<% end -%>
+      )
+  end
+<% else -%>
+  let(:valid_attributes) {FactoryGirl.attributes_for(:<%=file_name%>).slice *%w[<%= attribute_name %>].map(&:to_sym)}
+<% end -%>
+<% else -%>
+<% factory_girl = false -%>
+  let(:<%= file_name %>) {<%= class_name %>.create! valid_attributes}
+
+  let(:valid_attributes) do
+    skip("Add a hash of attributes valid for your model")
+  end
+<% end -%>
+
+  let(:invalid_attributes) do
+    # {<%= attribute_name %>: ''}
+    skip("Add a hash of attributes invalid for your model")
+  end
+
+  # 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 "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+      <%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+      get :index, {}, valid_session
+<% else -%>
+      get :index, params: {}, session: valid_session
+<% end -%>
+      expect(assigns(:<%= table_name %>)).to be_kind_of(ActiveRecord::Relation)
+      expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
+    end
+  end
+
+<% end -%>
+  describe "GET #show" do
+    it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+<% 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(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
+    end
+  end
+
+  describe "POST #create" do
+    context "with valid params" do
+      it "creates a new <%= class_name %>" do
+        expect 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 -%>
+        end.to change(<%= class_name %>, :count).by(1)
+      end
+
+      it "assigns a newly created <%= ns_file_name %> as @<%= 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(assigns(:<%= ns_file_name %>)).to be_a(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to be_persisted
+      end
+
+      it 'returns the "created" status' 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
+      end
+    end   # with valid params
+
+    context "with invalid params" do
+      it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
+        # allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
+<% 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(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
+      end
+
+      it 'returns the "unprocessable_entity" status' do
+        # allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
+<% 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
+      end
+    end   # with invalid params
+  end   # POST #create
+
+  describe "PUT #update" do
+    context "with valid params" do
+      let(:new_attributes) { {<%= attribute_name %>: 'New value'} }
+
+      it "updates the requested <%= ns_file_name %>" do
+        # expect_any_instance_of(<%= class_name %>)
+        #   .to receive(:update).with(new_attributes.inject({}){|_, (k, v)| _[k] = v.to_s; _})
+<% 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")
+        expect(<%= file_name %>.<%= attribute_name %>).to eq 'New value'
+      end
+
+      it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+<% 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(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
+      end
+
+      it 'returns the "OK" status' do
+<% 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
+      end
+    end  # with valid params
+
+    context "with invalid params" do
+      it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+        # allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
+<% 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(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
+      end
+
+      it 'returns the "unprocessable_entity" status' do
+        # allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
+<% 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
+      end
+    end   # with invalid params
+  end   # PUT #update
+
+  describe "DELETE #destroy" do
+    it "destroys the requested <%= ns_file_name %>" do
+      <%= file_name %>
+      expect do
+<% 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 -%>
+      end.to change(<%= class_name %>, :count).by(-1)
+    end
+
+    it 'returns the "no_content" status' do
+      <%= file_name %>
+<% 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 -%>
+      expect(response).to have_http_status :no_content
+    end
+  end   # DELETE #destroy
+
+end
+<% end -%>

data/lib/{templates → rspec_rails_scaffold_templates/generators/templates}/rspec/scaffold/controller_spec.rb

@@ -5,8 +5,7 @@ require 'spec_helper'
 <% end -%>
 
 <% module_namespacing do -%>
-describe <%= controller_class_name %>Controller, type: :controller do
-
+describe <%= controller_class_name %>Controller, <%= type_metatag(:controller) %> do
 <% if method = Rails.application.config.generators.options[:rails][:cancan] -%>
 <% method = 'current_user' unless Symbol === method -%>
   before :each do
@@ -22,6 +21,8 @@ describe <%= controller_class_name %>Controller, type: :controller do
 <% attribute_name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
 <% factory_girl = true -%>
+  let(:<%= file_name %>) {create :<%= file_name %>}
+
 <% if links.present? -%>
   let(:valid_attributes) do
     FactoryGirl.attributes_for(:<%=file_name%>)
@@ -37,6 +38,8 @@ describe <%= controller_class_name %>Controller, type: :controller do
 <% end -%>
 <% else -%>
 <% factory_girl = false -%>
+  let(:<%= file_name %>) {<%= class_name %>.create! valid_attributes}
+
   let(:valid_attributes) do
     skip("Add a hash of attributes valid for your model")
   end
@@ -53,173 +56,232 @@ describe <%= controller_class_name %>Controller, type: :controller do
   let(:valid_session) { {} }
 
 <% unless options[:singleton] -%>
-  describe "GET index" do
+  describe "GET #index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
-<% if factory_girl -%>
-      <%= file_name %> = create :<%= file_name %>
+      <%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+      get :index, {}, valid_session
 <% else -%>
-      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :index, params: {}, session: valid_session
 <% end -%>
-      get :index, {}, valid_session
       expect(assigns(:<%= table_name %>)).to be_kind_of(ActiveRecord::Relation)
       expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
     end
   end
 
 <% end -%>
-  describe "GET show" do
+  describe "GET #show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-<% if factory_girl -%>
-      <%= file_name %> = create :<%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+      get :show, {:id => <%= file_name %>.to_param}, valid_session
 <% else -%>
-      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :show,
+          params: {id: <%= file_name %>.to_param},
+          session: valid_session
 <% end -%>
-      get :show, {id: <%= file_name %>.to_param}, valid_session
       expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
   end
 
-  describe "GET new" do
+  describe "GET #new" do
     it "assigns a new <%= ns_file_name %> as @<%= ns_file_name %>" do
+<% if RUBY_VERSION < '1.9.3' -%>
       get :new, {}, valid_session
+<% else -%>
+      get :new, params: {}, session: valid_session
+<% end -%>
       expect(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
     end
   end
 
-  describe "GET edit" do
+  describe "GET #edit" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-<% if factory_girl -%>
-      <%= file_name %> = create :<%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+      get :edit, {:id => <%= file_name %>.to_param}, valid_session
 <% else -%>
-      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      get :edit, params: {id: <%= file_name %>.to_param},
+          session: valid_session
 <% end -%>
-      get :edit, {id: <%= file_name %>.to_param}, valid_session
       expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     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 do
-          post :create, {<%= ns_file_name %>: valid_attributes}, valid_session
+<% 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 -%>
         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
+<% 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(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
+<% 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 redirect_to(<%= class_name %>.last)
         # expect(response).to redirect_to(<%= index_helper %>_url)
       end
-    end
+    end   # with valid params
 
-    describe "with invalid params" do
+    context "with invalid params" do
       it "assigns a newly created but unsaved <%= ns_file_name %> as @<%= ns_file_name %>" do
         # allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
-        post :create, {<%= ns_file_name %>: invalid_attributes}, valid_session
+<% 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(assigns(:<%= ns_file_name %>)).to be_a_new(<%= class_name %>)
       end
 
       it "re-renders the 'new' template" do
         # allow_any_instance_of(<%= class_name %>).to receive(:save).and_return(false)
-        post :create, {<%= ns_file_name %>: invalid_attributes}, valid_session
+<% 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 render_template("new")
       end
-    end
-  end   # describe "POST create"
+    end   # with invalid params
+  end   # POST #create
 
-  describe "PUT update" do
-    describe "with valid params" do
+  describe "PUT #update" do
+    context "with valid params" do
       let(:new_attributes) { {<%= attribute_name %>: 'New value'} }
 
       it "updates the requested <%= ns_file_name %>" do
-<% if factory_girl -%>
-        <%= file_name %> = create :<%= file_name %>
-<% else -%>
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
-<% end -%>
         # expect_any_instance_of(<%= class_name %>)
         #   .to receive(:update).with(new_attributes.inject({}){|_, (k, v)| _[k] = v.to_s; _})
-        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: new_attributes}, valid_session
+<% 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")
         expect(<%= file_name %>.<%= attribute_name %>).to eq 'New value'
       end
 
       it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
-<% if factory_girl -%>
-        <%= file_name %> = create :<%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update,
+            {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes},
+            valid_session
 <% else -%>
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update,
+            params: {id: <%= file_name %>.to_param,
+                     <%= ns_file_name %>: valid_attributes},
+            session: valid_session
 <% end -%>
-        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, valid_session
         expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "redirects to the <%= ns_file_name %>" do
-<% if factory_girl -%>
-        <%= file_name %> = create :<%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update,
+            {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes},
+            valid_session
 <% else -%>
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update,
+            params: {id: <%= file_name %>.to_param,
+                     <%= ns_file_name %>: valid_attributes},
+            session: valid_session
 <% end -%>
-        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: valid_attributes}, valid_session
         expect(response).to redirect_to(<%= file_name %>)
       end
-    end
+    end  # with valid params
 
-    describe "with invalid params" do
+    context "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
-<% if factory_girl -%>
-        <%= file_name %> = create :<%= file_name %>
+        # allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update,
+            {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes},
+            valid_session
 <% else -%>
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update,
+            params: {id: <%= file_name %>.to_param,
+                     <%= ns_file_name %>: invalid_attributes},
+            session: valid_session
 <% end -%>
-        # allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
-        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, valid_session
-        expect(assigns(:<%= ns_file_name %>)).to be_a(<%= class_name %>)
+        expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
       end
 
       it "re-renders the 'edit' template" do
-<% if factory_girl -%>
-        <%= file_name %> = create :<%= file_name %>
+        # allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
+<% if RUBY_VERSION < '1.9.3' -%>
+        put :update,
+            {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => invalid_attributes},
+            valid_session
 <% else -%>
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
+        put :update,
+            params: {id: <%= file_name %>.to_param,
+                     <%= ns_file_name %>: invalid_attributes},
+            session: valid_session
 <% end -%>
-        # allow_any_instance_of(<%= class_name %>).to receive(:update).and_return(false)
-        put :update, {id: <%= file_name %>.to_param, <%= ns_file_name %>: invalid_attributes}, valid_session
         expect(response).to render_template("edit")
       end
-    end
-  end   # describe "PUT update"
+    end   # with invalid params
+  end   # PUT #update
 
-  describe "DELETE destroy" do
+  describe "DELETE #destroy" do
     it "destroys the requested <%= ns_file_name %>" do
-<% if factory_girl -%>
-      <%= file_name %> = create :<%= file_name %>
+      <%= file_name %>
+      expect do
+<% if RUBY_VERSION < '1.9.3' -%>
+        delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
 <% else -%>
-      <%= file_name %> = <%= class_name %>.create! valid_attributes
+        delete :destroy,
+            params: {id: <%= file_name %>.to_param},
+            session: valid_session
 <% end -%>
-      expect do
-        delete :destroy, {id: <%= file_name %>.to_param}, valid_session
       end.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
-<% if factory_girl -%>
-      <%= file_name %> = create :<%= file_name %>
+      <%= file_name %>
+<% if RUBY_VERSION < '1.9.3' -%>
+      delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
 <% else -%>
-      <%= file_name %> = <%= class_name %>.create! valid_attributes
+      delete :destroy,
+          params: {id: <%= file_name %>.to_param},
+          session: valid_session
 <% end -%>
-      delete :destroy, {id: <%= file_name %>.to_param}, valid_session
       expect(response).to redirect_to(<%= index_helper %>_url)
     end
-  end   # describe "DELETE destroy"
+  end   # DELETE #destroy
 
 end
 <% end -%>

data/lib/{templates → rspec_rails_scaffold_templates/generators/templates}/rspec/scaffold/edit_spec.rb

@@ -3,28 +3,37 @@ require 'rails_helper'
 <% else -%>
 require 'spec_helper'
 <% end -%>
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
+<% factory_girl = true -%>
+<% else -%>
+<% factory_girl = false -%>
+<% end -%>
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/edit", type: :view do
-  before(:each) do
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    allow(controller).to receive(:can?).and_return(true)
-<% end -%>
-<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, create(:<%= ns_file_name %>))
+describe "<%= ns_table_name %>/edit", <%= type_metatag(:view) %> do
+<% if factory_girl -%>
+  let(:<%= ns_file_name %>) {create :<%= ns_file_name %>}
 <% else -%>
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
+  let(:<%= ns_file_name %>) do
+    <%= 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 ? '' : ','%>
 <% end -%>
-<%= output_attributes.empty? ? "" : "    ))\n" -%>
+<%= output_attributes.empty? ? "" : "    )\n" -%>
+  end
+<% end -%>
+
+  before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
+    allow(controller).to receive(:can?).and_return(true)
 <% end -%>
+    assign(:<%= ns_file_name %>, <%= ns_file_name %>)
   end
 
   it "renders the edit <%= ns_file_name %> form" do
     render
 
-    assert_select "form[action='#{<%= ns_file_name %>_path(@<%= ns_file_name %>)}'][method='post']" do
+    assert_select "form[action='#{<%= ns_file_name %>_path(<%= ns_file_name %>)}'][method='post']" do
 <% for attribute in output_attributes -%>
 <% name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
 <% input_type = attribute.reference? ? 'select' : attribute.input_type -%>

data/lib/{templates → rspec_rails_scaffold_templates/generators/templates}/rspec/scaffold/index_spec.rb

@@ -3,27 +3,31 @@ require 'rails_helper'
 <% else -%>
 require 'spec_helper'
 <% end -%>
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
+<% factory_girl = true -%>
+<% else -%>
+<% factory_girl = false -%>
+<% end -%>
 
 <% output_attributes = attributes.reject{|attribute| [:created_at, :deleted_at, :updated_at].index(attribute.name) or attribute.password_digest? } -%>
-describe "<%= ns_table_name %>/index", type: :view do
-  before(:each) do
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    allow(controller).to receive(:can?).and_return(true)
-<% end -%>
-<% if options[:fixture_replacement] == :factory_girl -%>
-  # options[:fixture_replacement] == :factory_girl
-<% end -%>
-<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
-    @<%= ns_file_name %> = create(:<%= ns_file_name %>)
-<% else # no factory_girl -%>
-    <%= class_name %>.create(<%= output_attributes.empty? ? ')' : '' %>
+describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
+<% if factory_girl -%>
+  let(:<%= ns_file_name %>) {create :<%= ns_file_name %>}
+<% else -%>
+  let(:<%= ns_file_name %>) do
+    <%= 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 ? '' : ','%>
 <% end -%>
-<% if !output_attributes.empty? -%>
-    )
+<%= output_attributes.empty? ? "" : "    )\n" -%>
+  end
 <% end -%>
+
+  before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
+    allow(controller).to receive(:can?).and_return(true)
 <% end -%>
+    <%= ns_file_name %>  # to create
     assign :<%= table_name %>, <%= class_name %>.all
   end
 
@@ -33,9 +37,9 @@ describe "<%= ns_table_name %>/index", type: :view do
 <% for attribute in output_attributes -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
 <% if attribute.reference? -%>
-    assert_select 'tr>td', text: @<%= ns_file_name %>.<%= attribute.name %>.name, count: 1
+    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.name, count: 1
 <% else -%>
-    assert_select 'tr>td', text: @<%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
+    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
 <% end -%>
 <% else -%>
     assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 1
@@ -51,9 +55,9 @@ describe "<%= ns_table_name %>/index", type: :view do
 <% for attribute in output_attributes -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
 <% if attribute.reference? -%>
-    assert_select 'tr>td', text: @<%= ns_file_name %>.<%= attribute.name %>.name, count: 1
+    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.name, count: 1
 <% else -%>
-    assert_select 'tr>td', text: @<%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
+    assert_select 'tr>td', text: <%= ns_file_name %>.<%= attribute.name %>.to_s, count: 1
 <% end -%>
 <% else -%>
     assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 1

data/lib/{templates → rspec_rails_scaffold_templates/generators/templates}/rspec/scaffold/new_spec.rb

@@ -3,23 +3,32 @@ require 'rails_helper'
 <% else -%>
 require 'spec_helper'
 <% end -%>
+<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
+<% factory_girl = true -%>
+<% else -%>
+<% factory_girl = false -%>
+<% end -%>
 
 <% output_attributes = attributes.reject{|attribute| [:datetime, :timestamp, :time, :date].index(attribute.type) } -%>
-describe "<%= ns_table_name %>/new", type: :view do
-  before(:each) do
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    allow(controller).to receive(:can?).and_return(true)
-<% end -%>
-<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, build(:<%= ns_file_name %>))
-  end
+describe "<%= ns_table_name %>/new", <%= type_metatag(:view) %> do
+<% if factory_girl -%>
+  let(:<%= ns_file_name %>) {build :<%= ns_file_name %>}
 <% else -%>
-    assign(:<%= ns_file_name %>, <%= class_name %>.new(<%= '))' if output_attributes.empty? %>
+  let(:<%= ns_file_name %>) do
+    <%= class_name %>.new(<%= ')' if output_attributes.empty? %>
 <% output_attributes.each_with_index do |attribute, attribute_index| -%>
       <%= attribute.name %>: <%= value_for(attribute) %><%= attribute_index == output_attributes.length - 1 ? '' : ','%>
 <% end -%>
-<%= !output_attributes.empty? ? "    ))\n  end" : "  end" %>
+<%= output_attributes.empty? ? "" : "    )\n" -%>
+  end
+<% end -%>
+
+  before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
+    allow(controller).to receive(:can?).and_return(true)
 <% end -%>
+    assign(:<%= ns_file_name %>, <%= ns_file_name %>)
+  end
 
   it "renders new <%= ns_file_name %> form" do
     render

data/lib/{templates → rspec_rails_scaffold_templates/generators/templates}/rspec/scaffold/show_spec.rb

@@ -5,32 +5,36 @@ require 'spec_helper'
 <% end -%>
 
 <% output_attributes = attributes.reject{|attribute| [:created_at, :deleted_at, :updated_at].index(attribute.name) or attribute.password_digest? } -%>
-describe "<%= ns_table_name %>/show", type: :view do
-  before(:each) do
-<% if Rails.application.config.generators.options[:rails][:cancan] -%>
-    allow(controller).to receive(:can?).and_return(true)
-<% end -%>
+describe "<%= ns_table_name %>/show", <%= type_metatag(:view) %> do
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, create(:<%= ns_file_name %>))
+  let(:<%= ns_file_name %>) {create :<%= ns_file_name %>}
 <% else -%>
-    @<%= ns_file_name %> = assign(:<%= ns_file_name %>, <%= class_name %>.create!(<%= '))' if output_attributes.empty? %>
+  let(:<%= ns_file_name %>) do
+    <%= 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 ? '' : ','%>
 <% end -%>
 <% if !output_attributes.empty? -%>
-    ))
+    )
+<% end -%>
+  end
 <% end -%>
+
+  before(:each) do
+<% if Rails.application.config.generators.options[:rails][:cancan] -%>
+    allow(controller).to receive(:can?).and_return(true)
 <% end -%>
+    assign :<%= ns_file_name %>, <%= ns_file_name %>
   end
 
-  it "renders attributes in <dl>" do
+  it "renders attributes in dl>dd" do
     render
 <% for attribute in output_attributes -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
 <% if attribute.reference? -%>
-    assert_select 'dl>dd', text: Regexp.new(@<%= ns_file_name %>.<%= attribute.name %>.name)
+    assert_select 'dl>dd', text: Regexp.new(<%= ns_file_name %>.<%= attribute.name %>.name)
 <% else -%>
-    assert_select 'dl>dd', text: Regexp.new(@<%= ns_file_name %>.<%= attribute.name %>.to_s)
+    assert_select 'dl>dd', text: Regexp.new(<%= ns_file_name %>.<%= attribute.name %>.to_s)
 <% end -%>
 <% else -%>
     assert_select 'dl>dd', text: <%= value_for(attribute) %>

data/lib/rspec_rails_scaffold_templates/railties.rb

@@ -0,0 +1,9 @@
+module RspecRailsScaffoldTemplates
+  class Railtie < Rails::Railtie
+    config.app_generators do |g|
+      g.templates.unshift File::expand_path('../generators/templates', __FILE__)
+    end
+
+    require 'rspec_rails_scaffold_templates/generators/scaffold_generator'
+  end
+end

data/rspec_rails_scaffold_templates.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: rspec_rails_scaffold_templates 1.2.5 ruby lib
+# stub: rspec_rails_scaffold_templates 2.0.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rspec_rails_scaffold_templates"
-  s.version = "1.2.5"
+  s.version = "2.0.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Dmitri Koulikoff"]
-  s.date = "2016-03-23"
+  s.date = "2016-09-19"
   s.description = "RSpec scaffold generator templates that use FactoryGirl and WiceGrid"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [
@@ -27,12 +27,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "lib/rspec_rails_scaffold_templates.rb",
-    "lib/templates/rspec/integration/request_spec.rb",
-    "lib/templates/rspec/scaffold/controller_spec.rb",
-    "lib/templates/rspec/scaffold/edit_spec.rb",
-    "lib/templates/rspec/scaffold/index_spec.rb",
-    "lib/templates/rspec/scaffold/new_spec.rb",
-    "lib/templates/rspec/scaffold/show_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/scaffold_generator.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/integration/request_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/api_controller_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/controller_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/edit_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/index_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/new_spec.rb",
+    "lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/show_spec.rb",
+    "lib/rspec_rails_scaffold_templates/railties.rb",
     "rspec_rails_scaffold_templates.gemspec",
     "spec/rspec_rails_scaffold_templates_spec.rb",
     "spec/spec_helper.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_rails_scaffold_templates
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 2.0.0
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -96,12 +96,15 @@ files:
 - Rakefile
 - VERSION
 - lib/rspec_rails_scaffold_templates.rb
-- lib/templates/rspec/integration/request_spec.rb
-- lib/templates/rspec/scaffold/controller_spec.rb
-- lib/templates/rspec/scaffold/edit_spec.rb
-- lib/templates/rspec/scaffold/index_spec.rb
-- lib/templates/rspec/scaffold/new_spec.rb
-- lib/templates/rspec/scaffold/show_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/scaffold_generator.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/integration/request_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/api_controller_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/controller_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/edit_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/index_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/new_spec.rb
+- lib/rspec_rails_scaffold_templates/generators/templates/rspec/scaffold/show_spec.rb
+- lib/rspec_rails_scaffold_templates/railties.rb
 - rspec_rails_scaffold_templates.gemspec
 - spec/rspec_rails_scaffold_templates_spec.rb
 - spec/spec_helper.rb