rspec_rails_scaffold_templates 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5ace3dcb832579b7a882c8748ea886c708429bd
-  data.tar.gz: fb703f3cbefbfb9c0841e96673b1c2d80dbf6565
+  metadata.gz: fb9fa57cda2a4744edffadd02b61ef86bce7bfd1
+  data.tar.gz: 6e2ce7300fc7e1ac7789e5ef0036ee02a55515fc
 SHA512:
-  metadata.gz: c8695b6a9c41b46b08ef66f4739ffc9e2611ea9cc6a8ba4cff70d82aecb6fc6eb7b7a7edd0cfa374e61510e063ee8350d11a24358a33d1ed1c5c4356984eec05
-  data.tar.gz: 600812423e7b0e0c687e0609e5c5cfe3684bd85d2e41b1e554c4f07ff609ea354b440fea4ae7aa7f74aebbdec7de59d544c9528306b5f9b122033c1bd9ea1129
+  metadata.gz: 7d706be391e38d4f159732aef7144712b14de373a759d292fe40d51a2077aa889fda41c77082f4a0aece3bedd14f75c7426ad1c07ae18b912bb4df130dc52efa
+  data.tar.gz: 32962541aee92043cf1aa1b4fca0409dc9621049a76f408033ef6ff292a3d3d9cd89021ddaf1c653467ac839c9225da985e86e16b95fb39a222be509e0478ac9

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5

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

@@ -17,11 +17,24 @@ describe <%= controller_class_name %>Controller, type: :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. The list could not be empty.
-<% attribute = attributes.detect{|a| a.name == 'name' || a.name == 'title' || a.name == 'code' || a.name =~ /name/ || a.name =~ /title/} || attributes.first -%>
+<% 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 -%>
+<% 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(:valid_attributes) do

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.4 ruby lib
+# stub: rspec_rails_scaffold_templates 1.2.5 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "rspec_rails_scaffold_templates"
-  s.version = "1.2.4"
+  s.version = "1.2.5"
 
   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-22"
+  s.date = "2016-03-23"
   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.2.4
+  version: 1.2.5
 platform: ruby
 authors:
 - Dmitri Koulikoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec