rspec_rails_scaffold_templates 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ab917e3778d83572e0494b9c38c73c39a3ccae3
-  data.tar.gz: ff92ff555c659a2002f45431946734b9536f1704
+  metadata.gz: 574dccfbb1aa994597a59b926863f12c79cc50bf
+  data.tar.gz: 556bcf59ec0e2f1e422770eb570596641b91335a
 SHA512:
-  metadata.gz: 6de2ecd958d26af84a1bb9c521c5034a6429b8d73cf93788039cb6504dd06ab789f2884978dba14705c9a42c1f933f5003c800d6700ef25f1c0000c9a3457801
-  data.tar.gz: dc09e7fc53508e40148dbf6d25afb3d501dff9080634c28435c619cb2dfe527c8b3950ecb8ef240cf1f6fbd4bdffa3c0c3fc8db981b416386ccdd916e35c993c
+  metadata.gz: 8f65db632c50e3248d3eb4555ab5968921e49e928a0046490301cf0545a3d27a78740b061c16fe922a8b489a2f41c23407e75522a6dd2374f91665e9741d2d9e
+  data.tar.gz: a06e96d81c18c2576d944071df4823b60756c3275a099799250be7174e86199d4069de57b709782514d4e60b1d47004765201cea4ff292c3edddf06025500f93

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.2.1

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

@@ -21,7 +21,7 @@ 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(:valid_attributes) {FactoryGirl.build(:<%=file_name%>).attributes.slice *%w[<%= attribute_name %>]}
+  let(:valid_attributes) {FactoryGirl.attributes_for(:<%=file_name%>).slice *%w[<%= attribute_name %>].map(&:to_sym)}
 <% else -%>
 <% factory_girl = false -%>
   let(:valid_attributes) do

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

@@ -14,48 +14,31 @@ describe "<%= ns_table_name %>/index", type: :view do
   # options[:fixture_replacement] == :factory_girl
 <% end -%>
 <% if Rails.application.config.generators.options[:rails][:fixture_replacement] == :factory_girl -%>
-<% size = 1 -%>
     @<%= ns_file_name %> = create(:<%= ns_file_name %>)
-<% if not defined? Wice::WiceGrid -%>
-    assign(:<%= table_name %>, [@<%= ns_file_name %>, @<%= ns_file_name %>])
-<% size = 2 -%>
-<% end -%>
-<% else -%>
-<% size = 2 -%>
-<% if defined? Wice::WiceGrid -%>
-    result_set = assign(:<%= table_name %>, [
-<% else -%>
-    assign(:<%= table_name %>, [
-<% end -%>
-      # if you got an exception here add gem 'rspec-activemodel-mocks' to your Gemfile
-<% [1,2].each_with_index do |id, model_index| -%>
-      <%= class_name %>.create(<%= output_attributes.empty? ? (model_index == 1 ? ')' : '),') : '' %>
+<% else # no factory_girl -%>
+    <%= class_name %>.create(<%= 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? -%>
-      <%= model_index == 1 ? ')' : '),' %>
-<% end -%>
+    )
 <% end -%>
-    ])
 <% end -%>
+    assign :<%= table_name %>, <%= class_name %>.all
   end
 
   it "renders a list of <%= table_name %>" do
-<% if defined? Wice::WiceGrid -%>
-    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 %>
+    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: <%= size %>
+    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: <%= size %>
+    assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 1
 <% end -%>
 <% end -%>
   end
@@ -68,12 +51,12 @@ 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: <%= size %>
+    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: <%= size %>
+    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: <%= size %>
+    assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 1
 <% end -%>
 <% end -%>
   end

data/rspec_rails_scaffold_templates.gemspec

@@ -2,11 +2,11 @@
 # 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.0 ruby lib
+# stub: rspec_rails_scaffold_templates 1.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rspec_rails_scaffold_templates"
-  s.version = "1.2.0"
+  s.version = "1.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_rails_scaffold_templates
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Dmitri Koulikoff