rspec_rails_scaffold_templates 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85957f17443a8174b3a6faba670875a3f0bd8933
-  data.tar.gz: f8b312b8ff673c5374b3ac63bb93b9c2782abbf1
+  metadata.gz: 27d682e6616341bca9023ca6554f24827740eff4
+  data.tar.gz: 8e881d9500cc5195042a2fa28787b82417b60c90
 SHA512:
-  metadata.gz: 53bbc2b51cfa6308d34f52f9328df500a779c59a756447a5680f328ab1c06a94a21d82017f9b8544de52b83d42f10ff08b7378bddb75e9740c1a96a752fa00dd
-  data.tar.gz: 55e25cc99b607c25b0d1cf228ef5d538a45a887b89f8ce1129260ea1d0caae88229463ece924ddbebe65ff75a6f6b1fa0a1961d1ae101f46030408ec6e5bf3c3
+  metadata.gz: 878283db4d53d8ac0b68c868eea9cdd30dce52ecd2ae5c0913769ac43bd4d735caa58eac2375ba7060a06753c9d7fc4dbeb8fe2673d0ce3e1cd91af9fbf45c8a
+  data.tar.gz: cc41e0891511edf76ee8d065f0a83c8190b9d3f413875906dc5a7a76a1cdd1c10bef49d127d72bcfee0f9334aa317b620439fc5989f8d578e434f80313a2dcc3

data/VERSION

@@ -1 +1 @@
-1.0.1
+1.0.2

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

@@ -15,10 +15,12 @@ describe <%= controller_class_name %>Controller, :type => :controller do
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
   # adjust the attributes here as well. The list could not be empty.
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
+<% factory_girl = true -%>
 <% attribute = attributes.detect{|a| attributes.detect{|a| a.name == 'name'} || attributes.detect{|a| a.name == 'title'} || attributes.first} -%>
 <% attribute_name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
   let(:valid_attributes) {FactoryGirl.build(:<%=file_name%>).attributes.slice *%w[<%= attribute_name %>]}
 <% else -%>
+<% factory_girl = false -%>
   let(:valid_attributes) {
     skip("Add a hash of attributes valid for your model")
   }
@@ -36,7 +38,11 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 <% unless options[:singleton] -%>
   describe "GET index" do
     it "assigns all <%= table_name.pluralize %> as @<%= table_name.pluralize %>" do
+<% if factory_girl -%>
+      <%= file_name %> = create :<%= file_name %>
+<% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
       get :index, {}, valid_session
       expect(assigns(:<%= table_name %>)).to be_kind_of(ActiveRecord::Relation)
       expect(assigns(:<%= table_name %>)).to eq([<%= file_name %>])
@@ -46,7 +52,11 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 <% end -%>
   describe "GET show" do
     it "assigns the requested <%= ns_file_name %> as @<%= ns_file_name %>" do
+<% if factory_girl -%>
+      <%= file_name %> = create :<%= file_name %>
+<% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
       get :show, {:id => <%= file_name %>.to_param}, valid_session
       expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
@@ -61,7 +71,11 @@ describe <%= controller_class_name %>Controller, :type => :controller 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 %>
+<% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
       get :edit, {:id => <%= file_name %>.to_param}, valid_session
       expect(assigns(:<%= ns_file_name %>)).to eq(<%= file_name %>)
     end
@@ -105,30 +119,37 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 
   describe "PUT update" do
     describe "with valid params" do
-      let(:new_attributes) {
-<% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
-        FactoryGirl.build(:<%=file_name%>).attributes.slice *%w[<%= attribute_name %>]
-<% else -%>
-        skip("Add a hash of attributes valid for your model")
-<% end -%>
-      }
+      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
         <%= file_name %>.reload
-        skip("Add assertions for updated state")
+        # 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 %>
+<% else -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% 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 %>
+<% else -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
         put :update, {:id => <%= file_name %>.to_param, :<%= ns_file_name %> => valid_attributes}, valid_session
         expect(response).to redirect_to(<%= file_name %>)
       end
@@ -136,14 +157,22 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 
     describe "with invalid params" do
       it "assigns the <%= ns_file_name %> as @<%= ns_file_name %>" do
+<% if factory_girl -%>
+        <%= file_name %> = create :<%= file_name %>
+<% else -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% 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 %>)
       end
 
       it "re-renders the 'edit' template" do
+<% if factory_girl -%>
+        <%= file_name %> = create :<%= file_name %>
+<% else -%>
         <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% 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")
@@ -153,14 +182,22 @@ describe <%= controller_class_name %>Controller, :type => :controller do
 
   describe "DELETE destroy" do
     it "destroys the requested <%= ns_file_name %>" do
+<% if factory_girl -%>
+      <%= file_name %> = create :<%= file_name %>
+<% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
       expect {
         delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
       }.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
+<% if factory_girl -%>
+      <%= file_name %> = create :<%= file_name %>
+<% else -%>
       <%= file_name %> = <%= class_name %>.create! valid_attributes
+<% end -%>
       delete :destroy, {:id => <%= file_name %>.to_param}, valid_session
       expect(response).to redirect_to(<%= index_helper %>_url)
     end

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

@@ -24,8 +24,8 @@ describe "<%= ns_table_name %>/edit", :type => :view do
 
     assert_select "form[action=?][method=?]", <%= ns_file_name %>_path(@<%= ns_file_name %>), "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 -%>
+<% name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
+<% input_type = attribute.reference? ? 'select' : attribute.input_type -%>
       assert_select '<%= input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]', '<%= ns_file_name %>[<%= name %>]'
 <% end -%>
     end

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

@@ -36,12 +36,30 @@ describe "<%= ns_table_name %>/index", :type => :view do
 <% end -%>
     ])
 <% end -%>
+  end
+
+  it "renders a list of <%= table_name %>" do
 <% if defined? Wice::WiceGrid -%>
-    assign(:grid, Wice::WiceGrid.new(<%= class_name %>, controller))
+    assign :<%= table_name %>, [@<%= ns_file_name %>]
+<% end -%>
+    render
+
+<% 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: <%= size %>
+<% else -%>
+    assert_select 'tr>td', text: @<%= ns_file_name %>.<%= attribute.name %>.to_s, count: <%= size %>
+<% end -%>
+<% else -%>
+    assert_select "tr>td", :text => <%= value_for(attribute) %>.to_s, :count => <%= size %>
+<% end -%>
 <% end -%>
   end
 
-  it "renders a list of <%= table_name %>" do
+<% if defined? Wice::WiceGrid -%>
+  it "renders a list of <%= table_name %> in WiceGrid" do
+    assign :grid, Wice::WiceGrid.new(<%= class_name %>, controller)
     render
 
 <% for attribute in output_attributes -%>
@@ -56,4 +74,5 @@ describe "<%= ns_table_name %>/index", :type => :view do
 <% end -%>
 <% end -%>
   end
+<% end -%>
 end

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

@@ -24,8 +24,8 @@ describe "<%= ns_table_name %>/new", :type => :view do
 
     assert_select "form[action=?][method=?]", <%= index_helper %>_path, "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 -%>
+<% name = attribute.respond_to?(:column_name) ? attribute.column_name : attribute.name -%>
+<% input_type = attribute.reference? ? 'select' : attribute.input_type -%>
       assert_select '<%= input_type -%>#<%= ns_file_name %>_<%= name %>[name=?]', '<%= ns_file_name %>[<%= name %>]'
 <% 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.0.1 ruby lib
+# stub: rspec_rails_scaffold_templates 1.0.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rspec_rails_scaffold_templates"
-  s.version = "1.0.1"
+  s.version = "1.0.2"
 
   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 = "2014-09-17"
+  s.date = "2014-09-18"
   s.description = "RSpec scaffold generator templates that use FactoryGirl and WiceGrid"
   s.email = "dima@koulikoff.ru"
   s.extra_rdoc_files = [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_rails_scaffold_templates
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec