factory_girl 4.3.0 → 4.4.0

data/spec/acceptance/sequence_spec.rb

@@ -33,7 +33,7 @@ describe "sequences" do
 
   it "generates aliases for the sequence that reference the same block" do
     FactoryGirl.define do
-      sequence(:size, aliases: [:count, :length]) {|n| "called-#{n}" }
+      sequence(:size, aliases: [:count, :length]) { |n| "called-#{n}" }
     end
 
     first_value  = generate(:size)
@@ -47,7 +47,7 @@ describe "sequences" do
 
   it "generates aliases for the sequence that reference the same block and retains value" do
     FactoryGirl.define do
-      sequence(:size, "a", aliases: [:count, :length]) {|n| "called-#{n}" }
+      sequence(:size, "a", aliases: [:count, :length]) { |n| "called-#{n}" }
     end
 
     first_value  = generate(:size)

data/spec/acceptance/syntax_methods_within_dynamic_attributes_spec.rb

@@ -12,7 +12,7 @@ describe "syntax methods within dynamic attributes" do
     define_model("User", email: :string)
 
     FactoryGirl.define do
-      sequence(:email_address) {|n| "person-#{n}@example.com" }
+      sequence(:email_address) { |n| "person-#{n}@example.com" }
 
       factory :user do
         email { generate(:email_address) }
@@ -42,7 +42,7 @@ describe "syntax methods within dynamic attributes" do
   it 'allows syntax methods to be used when the block has an arity of 1' do
     FactoryGirl.define do
       factory :post_using_block_with_variable, parent: :post do
-        user {|_| build(:user) }
+        user { |_| build(:user) }
       end
     end
 

data/spec/acceptance/traits_spec.rb

@@ -187,11 +187,11 @@ describe "traits with callbacks" do
         name "John"
 
         trait :great do
-          after(:create) {|user| user.name.upcase! }
+          after(:create) { |user| user.name.upcase! }
         end
 
         trait :awesome do
-          after(:create) {|user| user.name = "awesome" }
+          after(:create) { |user| user.name = "awesome" }
         end
 
         factory :caps_user, traits: [:great]
@@ -232,7 +232,7 @@ describe "traits added via strategy" do
         end
 
         trait :great do
-          after(:create) {|user| user.name.upcase! }
+          after(:create) { |user| user.name.upcase! }
         end
       end
     end
@@ -427,11 +427,11 @@ describe "traits with to_create" do
     FactoryGirl.define do
       factory :user do
         trait :with_to_create do
-          to_create {|instance| instance.name = "to_create" }
+          to_create { |instance| instance.name = "to_create" }
         end
 
         factory :sub_user do
-          to_create {|instance| instance.name = "sub" }
+          to_create { |instance| instance.name = "sub" }
 
           factory :child_user
         end
@@ -444,7 +444,7 @@ describe "traits with to_create" do
 
         factory :sub_user_with_trait_and_override do
           with_to_create
-          to_create {|instance| instance.name = "sub with trait and override" }
+          to_create { |instance| instance.name = "sub with trait and override" }
 
           factory :child_user_with_trait_and_override
         end
@@ -479,7 +479,7 @@ describe "traits with to_create" do
   it "gives additional traits higher priority than base traits and factory definition" do
     FactoryGirl.define do
       trait :overridden do
-        to_create {|instance| instance.name = "completely overridden" }
+        to_create { |instance| instance.name = "completely overridden" }
       end
     end
 
@@ -588,7 +588,7 @@ describe "nested implicit traits" do
       FactoryGirl.define do
         trait :female do
           gender "female"
-          to_create {|instance| instance.gender = instance.gender.upcase }
+          to_create { |instance| instance.gender = instance.gender.upcase }
         end
 
         trait :jane_doe do
@@ -597,7 +597,7 @@ describe "nested implicit traits" do
 
         trait :admin do
           role "admin"
-          after(:build) {|instance| instance.role = instance.role.upcase }
+          after(:build) { |instance| instance.role = instance.role.upcase }
         end
 
         trait :female_admin do
@@ -619,7 +619,7 @@ describe "nested implicit traits" do
         factory :user do
           trait :female do
             gender "female"
-            to_create {|instance| instance.gender = instance.gender.upcase }
+            to_create { |instance| instance.gender = instance.gender.upcase }
           end
 
           trait :jane_doe do
@@ -628,7 +628,7 @@ describe "nested implicit traits" do
 
           trait :admin do
             role "admin"
-            after(:build) {|instance| instance.role = instance.role.upcase }
+            after(:build) { |instance| instance.role = instance.role.upcase }
           end
 
           trait :female_admin do
@@ -653,7 +653,7 @@ describe "implicit traits containing callbacks" do
         value 0
 
         trait :trait_with_callback do
-          after(:build) {|user| user.value += 1 }
+          after(:build) { |user| user.value += 1 }
         end
 
         factory :user_with_trait_with_callback do

data/spec/acceptance/transient_attributes_spec.rb

@@ -5,7 +5,7 @@ describe "transient attributes" do
     define_model("User", name: :string, email: :string)
 
     FactoryGirl.define do
-      sequence(:name) {|n| "John #{n}" }
+      sequence(:name) { |n| "John #{n}" }
 
       factory :user do
         ignore do

data/spec/factory_girl/attribute/dynamic_spec.rb

@@ -38,7 +38,7 @@ describe FactoryGirl::Attribute::Dynamic do
   end
 
   context "with a block returning a sequence" do
-    let(:block) { -> { FactoryGirl.register_sequence(FactoryGirl::Sequence.new(:email, 1) {|n| "foo#{n}" }) } }
+    let(:block) { -> { FactoryGirl.register_sequence(FactoryGirl::Sequence.new(:email, 1) { |n| "foo#{n}" }) } }
 
     it "raises a sequence abuse error" do
       expect { subject.to_proc.call }.to raise_error(FactoryGirl::SequenceAbuseError)

data/spec/factory_girl/definition_proxy_spec.rb

@@ -100,7 +100,7 @@ describe FactoryGirl::DefinitionProxy, "#sequence" do
   end
 
   it "creates a new sequence with a block" do
-    sequence_block = Proc.new {|n| "user+#{n}@example.com" }
+    sequence_block = Proc.new { |n| "user+#{n}@example.com" }
     proxy.sequence(:great, 1, &sequence_block)
     expect(FactoryGirl::Sequence).to have_received(:new).with(:great, 1, &sequence_block)
   end

data/spec/factory_girl/definition_spec.rb

@@ -32,7 +32,13 @@ describe FactoryGirl::Definition, "defining traits" do
   it "maintains a list of traits" do
     subject.define_trait(trait_1)
     subject.define_trait(trait_2)
-    expect(subject.defined_traits).to eq [trait_1, trait_2]
+    expect(subject.defined_traits).to include(trait_1, trait_2)
+  end
+
+  it "adds only unique traits" do
+    subject.define_trait(trait_1)
+    subject.define_trait(trait_1)
+    expect(subject.defined_traits.size).to eq 1
   end
 end
 

data/spec/factory_girl/sequence_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 describe FactoryGirl::Sequence do
   describe "a basic sequence" do
     let(:name) { :test }
-    subject    { FactoryGirl::Sequence.new(name) {|n| "=#{n}" } }
+    subject    { FactoryGirl::Sequence.new(name) { |n| "=#{n}" } }
 
     its(:name)  { should eq name }
     its(:names) { should eq [name] }
@@ -16,7 +16,7 @@ describe FactoryGirl::Sequence do
   end
 
   describe "a custom sequence" do
-    subject    { FactoryGirl::Sequence.new(:name, "A") {|n| "=#{n}" } }
+    subject    { FactoryGirl::Sequence.new(:name, "A") { |n| "=#{n}" } }
     its(:next) { should eq "=A" }
 
     describe "when incrementing" do
@@ -67,7 +67,7 @@ describe FactoryGirl::Sequence do
   end
 
   describe "iterating over items in an enumerator" do
-    subject { FactoryGirl::Sequence.new(:name, %w[foo bar].to_enum) {|n| "=#{n}" } }
+    subject { FactoryGirl::Sequence.new(:name, %w[foo bar].to_enum) { |n| "=#{n}" } }
 
     it "navigates to the next items until no items remain" do
       expect(subject.next).to eq "=foo"
@@ -77,7 +77,7 @@ describe FactoryGirl::Sequence do
   end
 
   describe "a custom sequence and scope" do
-    subject { FactoryGirl::Sequence.new(:name, 'A') {|n| "=#{n}#{foo}" } }
+    subject { FactoryGirl::Sequence.new(:name, 'A') { |n| "=#{n}#{foo}" } }
     let(:scope) { stub('scope', foo: 'attribute') }
 
     it 'increments within the correct scope' do

data/spec/support/matchers/trait.rb

@@ -1,6 +1,8 @@
 RSpec::Matchers.define :have_trait do |trait_name|
   match do |instance|
-    instance.defined_traits.include?(FactoryGirl::Trait.new(trait_name, &@block))
+    instance.defined_traits.any? do |trait|
+      trait.name == trait_name && trait.send(:block) == @block
+    end
   end
 
   chain :with_block do |block|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 4.3.0
+  version: 4.4.0
 platform: ruby
 authors:
 - Josh Clayton
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2014-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -279,6 +279,7 @@ files:
 - spec/acceptance/global_to_create_spec.rb
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/keyed_by_class_spec.rb
+- spec/acceptance/lint_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
 - spec/acceptance/nested_attributes_spec.rb
@@ -386,6 +387,7 @@ test_files:
 - spec/acceptance/global_to_create_spec.rb
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/keyed_by_class_spec.rb
+- spec/acceptance/lint_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
 - spec/acceptance/nested_attributes_spec.rb