factory_girl 3.2.0 → 3.3.0

data/spec/factory_girl/strategy/build_spec.rb

@@ -1,7 +1,7 @@
 require "spec_helper"
 
 describe FactoryGirl::Strategy::Build do
-  it_should_behave_like "strategy with association support", FactoryGirl::Strategy::Create
+  it_should_behave_like "strategy with association support", :create
   it_should_behave_like "strategy with callbacks", :after_build
-  it_should_behave_like "strategy with strategy: :build", FactoryGirl::Strategy::Build
+  it_should_behave_like "strategy with strategy: :build", :build
 end

data/spec/factory_girl/strategy/create_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe FactoryGirl::Strategy::Create do
-  it_should_behave_like "strategy with association support", FactoryGirl::Strategy::Create
+  it_should_behave_like "strategy with association support", :create
   it_should_behave_like "strategy with callbacks", :after_build, :before_create, :after_create
 
   it "runs a custom create block" do

data/spec/factory_girl/strategy/stub_spec.rb

@@ -1,9 +1,9 @@
 require 'spec_helper'
 
 describe FactoryGirl::Strategy::Stub do
-  it_should_behave_like "strategy with association support", FactoryGirl::Strategy::Stub
+  it_should_behave_like "strategy with association support", :build_stubbed
   it_should_behave_like "strategy with callbacks", :after_stub
-  it_should_behave_like "strategy with strategy: :build", FactoryGirl::Strategy::Stub
+  it_should_behave_like "strategy with strategy: :build", :build_stubbed
 
   context "asking for a result" do
     before { Timecop.freeze(Time.now) }

data/spec/factory_girl/strategy_calculator_spec.rb

@@ -1,23 +1,29 @@
 require "spec_helper"
 
-describe FactoryGirl::StrategyCalculator, "with a FactoryGirl::Strategy object" do
-  let(:strategy) { FactoryGirl::Strategy::Build }
-
-  it "returns the strategy object" do
-    FactoryGirl::StrategyCalculator.new(strategy).strategy.should == strategy
-  end
-end
-
 describe FactoryGirl::StrategyCalculator do
-  it "returns the correct strategy object for :build" do
-    FactoryGirl::StrategyCalculator.new(:build).strategy.should == FactoryGirl::Strategy::Build
+  let(:strategy) do
+    define_class("MyAwesomeClass")
   end
 
-  it "returns the correct strategy object for :create" do
-    FactoryGirl::StrategyCalculator.new(:create).strategy.should == FactoryGirl::Strategy::Create
+  context "when a class" do
+    subject { FactoryGirl::StrategyCalculator.new(strategy).strategy }
+
+    it "returns the class passed" do
+      subject.should == strategy
+    end
   end
 
-  it "raises when passing a bogus strategy" do
-    expect { FactoryGirl::StrategyCalculator.new(:bogus_strategy).strategy }.to raise_error(ArgumentError, /bogus_strategy/)
+  context "when a symbol" do
+    before  { FactoryGirl.stubs(:strategy_by_name).returns(strategy) }
+    subject { FactoryGirl::StrategyCalculator.new(:build).strategy }
+
+    it "finds the strategy by name" do
+      subject
+      FactoryGirl.should have_received(:strategy_by_name).with(:build)
+    end
+
+    it "returns the strategy found" do
+      subject.should == strategy
+    end
   end
 end

data/spec/support/shared_examples/strategy.rb

@@ -3,7 +3,7 @@ shared_examples_for "strategy without association support" do
   let(:attribute) { FactoryGirl::Attribute::Association.new(:user, :user, {}) }
 
   def association_named(name, overrides)
-    runner = FactoryGirl::FactoryRunner.new(name, FactoryGirl::Strategy::Build, [overrides])
+    runner = FactoryGirl::FactoryRunner.new(name, :build, [overrides])
     subject.association(runner)
   end
 
@@ -18,7 +18,7 @@ shared_examples_for "strategy without association support" do
   end
 end
 
-shared_examples_for "strategy with association support" do |factory_girl_strategy_class|
+shared_examples_for "strategy with association support" do |factory_girl_strategy_name|
   let(:factory) { stub("associate_factory") }
 
   def association_named(name, strategy, overrides)
@@ -33,22 +33,21 @@ shared_examples_for "strategy with association support" do |factory_girl_strateg
   end
 
   it "runs the factory with the correct overrides" do
-    association_named(:author, factory_girl_strategy_class, great: "value")
-    factory.should have_received(:run).with(factory_girl_strategy_class, great: "value")
+    association_named(:author, factory_girl_strategy_name, great: "value")
+    factory.should have_received(:run).with(factory_girl_strategy_name, great: "value")
   end
 
   it "finds the factory with the correct factory name" do
-    association_named(:author, factory_girl_strategy_class, great: "value")
+    association_named(:author, factory_girl_strategy_name, great: "value")
     FactoryGirl.should have_received(:factory_by_name).with(:author)
   end
 end
 
-shared_examples_for "strategy with strategy: :build" do |factory_girl_strategy_class|
+shared_examples_for "strategy with strategy: :build" do |factory_girl_strategy_name|
   let(:factory) { stub("associate_factory") }
 
   def association_named(name, overrides)
-    strategy = FactoryGirl::StrategyCalculator.new(overrides[:strategy]).strategy
-    runner = FactoryGirl::FactoryRunner.new(name, strategy, [overrides.except(:strategy)])
+    runner = FactoryGirl::FactoryRunner.new(name, overrides[:strategy], [overrides.except(:strategy)])
     subject.association(runner)
   end
 
@@ -60,7 +59,7 @@ shared_examples_for "strategy with strategy: :build" do |factory_girl_strategy_c
 
   it "runs the factory with the correct overrides" do
     association_named(:author, strategy: :build, great: "value")
-    factory.should have_received(:run).with(factory_girl_strategy_class, { great: "value" })
+    factory.should have_received(:run).with(factory_girl_strategy_name, { great: "value" })
   end
 
   it "finds the factory with the correct factory name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-24 00:00:00.000000000Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70135979934020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,15 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70135979934020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70135979933560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +38,15 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70135979933560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70135979933100 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +54,15 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *70135979933100
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70135979932720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +70,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135979932720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70135979932260 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +86,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135979932260
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70135979931840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +102,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135979931840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70135979931420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +118,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135979931420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70135979931000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +134,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135979931000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70135968969860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +150,15 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70135968969860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70135968969440 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +166,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135968969440
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70135968968980 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +182,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135968968980
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70135968968560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +198,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70135968968560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 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."
@@ -177,7 +237,6 @@ files:
 - features/step_definitions/factory_girl_steps.rb
 - features/support/env.rb
 - features/support/factories.rb
-- gemfiles/2.3.gemfile
 - gemfiles/3.0.gemfile
 - gemfiles/3.0.gemfile.lock
 - gemfiles/3.1.gemfile
@@ -195,6 +254,7 @@ files:
 - lib/factory_girl/attribute_list.rb
 - lib/factory_girl/callback.rb
 - lib/factory_girl/callbacks_observer.rb
+- lib/factory_girl/configuration.rb
 - lib/factory_girl/declaration.rb
 - lib/factory_girl/declaration/association.rb
 - lib/factory_girl/declaration/dynamic.rb
@@ -202,6 +262,7 @@ files:
 - lib/factory_girl/declaration/static.rb
 - lib/factory_girl/declaration_list.rb
 - lib/factory_girl/definition.rb
+- lib/factory_girl/definition_list.rb
 - lib/factory_girl/definition_proxy.rb
 - lib/factory_girl/disallows_duplicates_registry.rb
 - lib/factory_girl/errors.rb
@@ -223,6 +284,7 @@ files:
 - lib/factory_girl/strategy/null.rb
 - lib/factory_girl/strategy/stub.rb
 - lib/factory_girl/strategy_calculator.rb
+- lib/factory_girl/strategy_syntax_method_registrar.rb
 - lib/factory_girl/syntax.rb
 - lib/factory_girl/syntax/blueprint.rb
 - lib/factory_girl/syntax/default.rb
@@ -250,6 +312,8 @@ files:
 - spec/acceptance/define_child_before_parent_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
+- spec/acceptance/global_initialize_with_spec.rb
+- spec/acceptance/global_to_create_spec.rb
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
@@ -321,7 +385,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: factory_girl provides a framework and DSL for defining and using model instance
@@ -334,7 +398,6 @@ test_files:
 - features/step_definitions/factory_girl_steps.rb
 - features/support/env.rb
 - features/support/factories.rb
-- gemfiles/2.3.gemfile
 - gemfiles/3.0.gemfile
 - gemfiles/3.0.gemfile.lock
 - gemfiles/3.1.gemfile
@@ -357,6 +420,8 @@ test_files:
 - spec/acceptance/define_child_before_parent_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
+- spec/acceptance/global_initialize_with_spec.rb
+- spec/acceptance/global_to_create_spec.rb
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb

data/gemfiles/2.3.gemfile

@@ -1,7 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "activerecord", "~> 2.3"
-
-gemspec :path=>"../"