factory_girl 3.1.1 → 3.2.0

data/spec/factory_girl/disallows_duplicates_registry_spec.rb

@@ -0,0 +1,44 @@
+require "spec_helper"
+
+describe FactoryGirl::DisallowsDuplicatesRegistry do
+  let(:registry) { stub("registry", name: "Great thing", register: true, find: true, each: true, clear: true, registered?: true, :[] => true) }
+
+  subject { FactoryGirl::DisallowsDuplicatesRegistry.new(registry) }
+
+  it "delegates #each to the registry" do
+    block = -> {}
+    subject.each(block)
+    registry.should have_received(:each).with(block)
+  end
+
+  it "delegates #registered? to the registry" do
+    subject.registered?(:great_name)
+    registry.should have_received(:registered?).with(:great_name)
+  end
+
+  it "delegates #clear to the registry" do
+    subject.clear
+    registry.should have_received(:clear)
+  end
+
+  it "delegates #find to the registry" do
+    subject.find(:awesome)
+    registry.should have_received(:find).with(:awesome)
+  end
+
+  it "delegates #[] to the registry" do
+    subject[:awesome]
+    registry.should have_received(:[]).with(:awesome)
+  end
+
+  it "delegates #register to the registry when not registered" do
+    registry.stubs(registered?: false)
+    subject.register(:awesome, {})
+    registry.should have_received(:register).with(:awesome, {})
+  end
+
+  it "raises when attempting to #register a previously registered strategy" do
+    expect { subject.register(:same_name, {}) }.
+      to raise_error(FactoryGirl::DuplicateDefinitionError, "Great thing already registered: same_name")
+  end
+end

data/spec/factory_girl/evaluator_class_definer_spec.rb

@@ -1,13 +1,13 @@
 require "spec_helper"
 
 describe FactoryGirl::EvaluatorClassDefiner do
-  let(:simple_attribute)                    { stub("simple attribute",   name: :simple, to_proc: lambda { 1 }) }
-  let(:relative_attribute)                  { stub("relative attribute", name: :relative, to_proc: lambda { simple + 1 }) }
-  let(:attribute_that_raises_a_second_time) { stub("attribute that would raise without a cache", name: :raises_without_proper_cache, to_proc: lambda { raise "failed" if @run; @run = true; nil }) }
+  let(:simple_attribute)                    { stub("simple attribute",   name: :simple, to_proc: -> { 1 }) }
+  let(:relative_attribute)                  { stub("relative attribute", name: :relative, to_proc: -> { simple + 1 }) }
+  let(:attribute_that_raises_a_second_time) { stub("attribute that would raise without a cache", name: :raises_without_proper_cache, to_proc: -> { raise "failed" if @run; @run = true; nil }) }
 
   let(:attributes)    { [simple_attribute, relative_attribute, attribute_that_raises_a_second_time] }
   let(:class_definer) { FactoryGirl::EvaluatorClassDefiner.new(attributes, FactoryGirl::Evaluator) }
-  let(:evaluator)     { class_definer.evaluator_class.new(stub("build strategy", add_observer: true)) }
+  let(:evaluator)     { class_definer.evaluator_class.new(Object, stub("build strategy", add_observer: true)) }
 
   it "returns an evaluator when accessing the evaluator class" do
     evaluator.should be_a(FactoryGirl::Evaluator)
@@ -32,7 +32,7 @@ describe FactoryGirl::EvaluatorClassDefiner do
   end
 
   context "with a custom evaluator as a parent class" do
-    let(:child_attributes) { [stub("child attribute", name: :simple, to_proc: lambda { 1 })] }
+    let(:child_attributes) { [stub("child attribute", name: :simple, to_proc: -> { 1 })] }
     let(:child_definer)    { FactoryGirl::EvaluatorClassDefiner.new(child_attributes, class_definer.evaluator_class) }
 
     subject { child_definer.evaluator_class }

data/spec/factory_girl/factory_spec.rb

@@ -19,7 +19,7 @@ describe FactoryGirl::Factory do
   it "passes a custom creation block" do
     strategy = stub("strategy", result: nil, add_observer: true)
     FactoryGirl::Strategy::Build.stubs(new: strategy)
-    block = lambda {}
+    block = -> {}
     factory = FactoryGirl::Factory.new(:object)
     factory.to_create(&block)
 
@@ -69,7 +69,7 @@ describe FactoryGirl::Factory do
     end
 
     it "does not call a lazy attribute block for an overridden attribute" do
-      declaration = FactoryGirl::Declaration::Dynamic.new(@name, false, lambda { flunk })
+      declaration = FactoryGirl::Declaration::Dynamic.new(@name, false, -> { flunk })
       @factory.declare_attribute(declaration)
       @factory.run(FactoryGirl::Strategy::AttributesFor, @hash)
     end
@@ -252,7 +252,7 @@ describe FactoryGirl::Factory, "running a factory" do
 
   it "calls the block and returns the result" do
     block_run = nil
-    block = lambda {|result| block_run = "changed" }
+    block = ->(result) { block_run = "changed" }
     subject.run(FactoryGirl::Strategy::Build, { }, &block)
     block_run.should == "changed"
   end

data/spec/factory_girl/null_object_spec.rb

@@ -1,8 +1,22 @@
 require "spec_helper"
 
 describe FactoryGirl::NullObject do
-  its(:id)     { should be_nil }
-  its(:age)    { should be_nil }
-  its(:name)   { should be_nil }
-  its(:admin?) { should be_nil }
+  let(:methods_to_respond_to)     { %w[id age name admin?] }
+  let(:methods_to_not_respond_to) { %w[email date_of_birth title] }
+
+  subject { FactoryGirl::NullObject.new(methods_to_respond_to) }
+
+  it "responds to the given methods" do
+    methods_to_respond_to.each do |method_name|
+      subject.__send__(method_name).should be_nil
+      subject.respond_to?(method_name).should be_true
+    end
+  end
+
+  it "does not respond to other methods" do
+    methods_to_not_respond_to.each do |method_name|
+      expect { subject.__send__(method_name) }.to raise_error(NoMethodError)
+      subject.respond_to?(method_name).should be_false
+    end
+  end
 end

data/spec/factory_girl/registry_spec.rb

@@ -1,102 +1,60 @@
 require 'spec_helper'
 
 describe FactoryGirl::Registry do
-  let(:aliases)              { [:thing, :widget] }
-  let(:factory)              { FactoryGirl::Factory.new(:object) }
-  let(:other_factory)        { FactoryGirl::Factory.new(:string) }
-  let(:factory_with_aliases) { FactoryGirl::Factory.new(:string, aliases: aliases) }
-  let(:registry_name)        { "Factory" }
+  let(:registered_object)        { stub("registered object") }
+  let(:second_registered_object) { stub("second registered object") }
 
-  subject { FactoryGirl::Registry.new(registry_name) }
+  subject { FactoryGirl::Registry.new("Great thing") }
 
   it { should be_kind_of(Enumerable) }
 
-  it "finds a registered a factory" do
-    subject.add(factory)
-    subject.find(factory.name).should == factory
+  it "finds a registered object" do
+    subject.register(:object_name, registered_object)
+    subject.find(:object_name).should == registered_object
   end
 
-  it "raises when finding an unregistered factory" do
-    expect { subject.find(:bogus) }.to raise_error(ArgumentError, "Factory not registered: bogus")
+  it "finds a registered object with square brackets" do
+    subject.register(:object_name, registered_object)
+    subject[:object_name].should == registered_object
   end
 
-  it "adds and returns a factory" do
-    subject.add(factory).should == factory
+  it "raises when an object cannot be found" do
+    expect { subject.find(:object_name) }.to raise_error(ArgumentError, "Great thing not registered: object_name")
   end
 
-  it "knows that a factory is registered by symbol" do
-    subject.add(factory)
-    subject.should be_registered(factory.name.to_sym)
+  it "adds and returns the object registered" do
+    subject.register(:object_name, registered_object).should == registered_object
   end
 
-  it "knows that a factory is registered by string" do
-    subject.add(factory)
-    subject.should be_registered(factory.name.to_s)
+  it "knows that an object is registered by symbol" do
+    subject.register(:object_name, registered_object)
+    subject.should be_registered(:object_name)
   end
 
-  it "knows that a factory isn't registered" do
-    subject.should_not be_registered("bogus")
-  end
-
-  it "can be accessed like a hash" do
-    subject.add(factory)
-    subject[factory.name].should == factory
-  end
-
-  it "iterates registered factories" do
-    subject.add(factory)
-    subject.add(other_factory)
-    subject.to_a.should =~ [factory, other_factory]
+  it "knows that an object is registered by string" do
+    subject.register(:object_name, registered_object)
+    subject.should be_registered("object_name")
   end
 
-  it "iterates registered factories uniquely with aliases" do
-    subject.add(factory)
-    subject.add(factory_with_aliases)
-    subject.to_a.should =~ [factory, factory_with_aliases]
+  it "knows when an object is not registered" do
+    subject.should_not be_registered("bogus")
   end
 
-  it "doesn't allow a duplicate name" do
-    expect { 2.times { subject.add(factory) } }.
-      to raise_error(FactoryGirl::DuplicateDefinitionError, "Factory already registered: object")
+  it "iterates registered objects" do
+    subject.register(:first_object, registered_object)
+    subject.register(:second_object, second_registered_object)
+    subject.to_a.should == [registered_object, second_registered_object]
   end
 
-  it "registers aliases" do
-    subject.add(factory_with_aliases)
-    aliases.each do |name|
-      subject.find(name).should == factory_with_aliases
-    end
+  it "does not include duplicate objects with registered under different names" do
+    subject.register(:first_object, registered_object)
+    subject.register(:second_object, registered_object)
+    subject.to_a.should == [registered_object]
   end
 
   it "clears registered factories" do
-    subject.add(factory)
+    subject.register(:object_name, registered_object)
     subject.clear
     subject.count.should be_zero
   end
 end
-
-describe FactoryGirl::Registry, "with sequences" do
-  let(:aliases)               { [:sender, :receiver] }
-  let(:sequence)              { FactoryGirl::Sequence.new(:email) { |n| "somebody#{n}@example.com" } }
-  let(:sequence_with_aliases) { FactoryGirl::Sequence.new(:email, aliases: aliases) { |n| "someone_else#{n}@example.com" } }
-  let(:registry_name)         { "Sequence" }
-
-  subject { FactoryGirl::Registry.new(registry_name) }
-
-  it "registers an sequence" do
-    subject.add(sequence)
-    subject.find(:email).should == sequence
-  end
-
-  it "registers a sequence with aliases" do
-    subject.add(sequence_with_aliases)
-
-    subject.find(:email).should    == sequence_with_aliases
-    subject.find(:sender).should   == sequence_with_aliases
-    subject.find(:receiver).should == sequence_with_aliases
-  end
-
-  it "doesn't allow a duplicate name" do
-    expect { 2.times { subject.add(sequence_with_aliases) } }.
-      to raise_error(FactoryGirl::DuplicateDefinitionError, "Sequence already registered: email")
-  end
-end

data/spec/factory_girl/sequence_spec.rb

@@ -26,8 +26,9 @@ describe FactoryGirl::Sequence do
   end
 
   describe "a sequence with aliases using default value" do
-    subject    { FactoryGirl::Sequence.new(:test, aliases: [:alias, :other]) { |n| "=#{n}" } }
-    its(:next) { should == "=1" }
+    subject     { FactoryGirl::Sequence.new(:test, aliases: [:alias, :other]) { |n| "=#{n}" } }
+    its(:next)  { should == "=1" }
+    its(:names) { should == [:test, :alias, :other] }
 
     describe "when incrementing" do
       before     { subject.next }

data/spec/factory_girl/strategy_calculator_spec.rb

@@ -18,6 +18,6 @@ describe FactoryGirl::StrategyCalculator do
   end
 
   it "raises when passing a bogus strategy" do
-    expect { FactoryGirl::StrategyCalculator.new(:bogus_strategy).strategy }.to raise_error "unrecognized method bogus_strategy"
+    expect { FactoryGirl::StrategyCalculator.new(:bogus_strategy).strategy }.to raise_error(ArgumentError, /bogus_strategy/)
   end
 end

data/spec/spec_helper.rb

@@ -6,7 +6,6 @@ require 'rspec'
 require 'rspec/autorun'
 
 require "simplecov"
-SimpleCov.start
 
 require 'factory_girl'
 require "mocha"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-17 00:00:00.000000000 Z
+date: 2012-04-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70213807643080 !ruby/object:Gem::Requirement
+  requirement: &70135979934020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213807643080
+  version_requirements: *70135979934020
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70213807642540 !ruby/object:Gem::Requirement
+  requirement: &70135979933560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70213807642540
+  version_requirements: *70135979933560
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70213807641780 !ruby/object:Gem::Requirement
+  requirement: &70135979933100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70213807641780
+  version_requirements: *70135979933100
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70213807640520 !ruby/object:Gem::Requirement
+  requirement: &70135979932720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807640520
+  version_requirements: *70135979932720
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70213807654720 !ruby/object:Gem::Requirement
+  requirement: &70135979932260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807654720
+  version_requirements: *70135979932260
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70213807653320 !ruby/object:Gem::Requirement
+  requirement: &70135979931840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807653320
+  version_requirements: *70135979931840
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70213807651760 !ruby/object:Gem::Requirement
+  requirement: &70135979931420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807651760
+  version_requirements: *70135979931420
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70213807650780 !ruby/object:Gem::Requirement
+  requirement: &70135979931000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807650780
+  version_requirements: *70135979931000
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70213807649900 !ruby/object:Gem::Requirement
+  requirement: &70135968969860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70213807649900
+  version_requirements: *70135968969860
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70213807649360 !ruby/object:Gem::Requirement
+  requirement: &70135968969440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807649360
+  version_requirements: *70135968969440
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70213807648700 !ruby/object:Gem::Requirement
+  requirement: &70135968968980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807648700
+  version_requirements: *70135968968980
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70213807740080 !ruby/object:Gem::Requirement
+  requirement: &70135968968560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70213807740080
+  version_requirements: *70135968968560
 description: ! "factory_girl provides a framework and DSL for defining and\n                      using
   factories - less error-prone, more explicit, and\n                      all-around
   easier to work with than fixtures."
@@ -157,6 +157,7 @@ files:
 - .autotest
 - .gitignore
 - .rspec
+- .simplecov
 - .travis.yml
 - .yardopts
 - Appraisals
@@ -193,7 +194,7 @@ files:
 - lib/factory_girl/attribute_assigner.rb
 - lib/factory_girl/attribute_list.rb
 - lib/factory_girl/callback.rb
-- lib/factory_girl/callback_runner.rb
+- lib/factory_girl/callbacks_observer.rb
 - lib/factory_girl/declaration.rb
 - lib/factory_girl/declaration/association.rb
 - lib/factory_girl/declaration/dynamic.rb
@@ -202,6 +203,7 @@ files:
 - lib/factory_girl/declaration_list.rb
 - lib/factory_girl/definition.rb
 - lib/factory_girl/definition_proxy.rb
+- lib/factory_girl/disallows_duplicates_registry.rb
 - lib/factory_girl/errors.rb
 - lib/factory_girl/evaluation.rb
 - lib/factory_girl/evaluator.rb
@@ -229,8 +231,10 @@ files:
 - lib/factory_girl/syntax/methods.rb
 - lib/factory_girl/syntax/sham.rb
 - lib/factory_girl/syntax/vintage.rb
+- lib/factory_girl/syntax_runner.rb
 - lib/factory_girl/trait.rb
 - lib/factory_girl/version.rb
+- spec/acceptance/activesupport_instrumentation_spec.rb
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attribute_existing_on_object_spec.rb
@@ -252,13 +256,16 @@ files:
 - spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
+- spec/acceptance/register_strategies_spec.rb
 - spec/acceptance/sequence_spec.rb
+- spec/acceptance/skip_create_spec.rb
 - spec/acceptance/stub_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
 - spec/acceptance/syntax/generate_spec.rb
 - spec/acceptance/syntax/make_spec.rb
 - spec/acceptance/syntax/sham_spec.rb
 - spec/acceptance/syntax/vintage_spec.rb
+- spec/acceptance/syntax_methods_within_dynamic_attributes_spec.rb
 - spec/acceptance/traits_spec.rb
 - spec/acceptance/transient_attributes_spec.rb
 - spec/factory_girl/aliases_spec.rb
@@ -273,6 +280,7 @@ files:
 - spec/factory_girl/declaration_list_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
 - spec/factory_girl/definition_spec.rb
+- spec/factory_girl/disallows_duplicates_registry_spec.rb
 - spec/factory_girl/evaluator_class_definer_spec.rb
 - spec/factory_girl/factory_spec.rb
 - spec/factory_girl/find_definitions_spec.rb
@@ -313,7 +321,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance
@@ -333,6 +341,7 @@ test_files:
 - gemfiles/3.1.gemfile.lock
 - gemfiles/3.2.gemfile
 - gemfiles/3.2.gemfile.lock
+- spec/acceptance/activesupport_instrumentation_spec.rb
 - spec/acceptance/aliases_spec.rb
 - spec/acceptance/attribute_aliases_spec.rb
 - spec/acceptance/attribute_existing_on_object_spec.rb
@@ -354,13 +363,16 @@ test_files:
 - spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
+- spec/acceptance/register_strategies_spec.rb
 - spec/acceptance/sequence_spec.rb
+- spec/acceptance/skip_create_spec.rb
 - spec/acceptance/stub_spec.rb
 - spec/acceptance/syntax/blueprint_spec.rb
 - spec/acceptance/syntax/generate_spec.rb
 - spec/acceptance/syntax/make_spec.rb
 - spec/acceptance/syntax/sham_spec.rb
 - spec/acceptance/syntax/vintage_spec.rb
+- spec/acceptance/syntax_methods_within_dynamic_attributes_spec.rb
 - spec/acceptance/traits_spec.rb
 - spec/acceptance/transient_attributes_spec.rb
 - spec/factory_girl/aliases_spec.rb
@@ -375,6 +387,7 @@ test_files:
 - spec/factory_girl/declaration_list_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
 - spec/factory_girl/definition_spec.rb
+- spec/factory_girl/disallows_duplicates_registry_spec.rb
 - spec/factory_girl/evaluator_class_definer_spec.rb
 - spec/factory_girl/factory_spec.rb
 - spec/factory_girl/find_definitions_spec.rb