factory_girl 2.6.4 → 3.0.0.rc1

data/spec/factory_girl/registry_spec.rb

@@ -5,7 +5,7 @@ describe FactoryGirl::Registry do
   let(:sequence)             { FactoryGirl::Sequence.new(:email) { |n| "somebody#{n}@example.com" } }
   let(:factory)              { FactoryGirl::Factory.new(:object) }
   let(:other_factory)        { FactoryGirl::Factory.new(:string) }
-  let(:factory_with_aliases) { FactoryGirl::Factory.new(:string, :aliases => aliases) }
+  let(:factory_with_aliases) { FactoryGirl::Factory.new(:string, aliases: aliases) }
   let(:registry_name)        { "Factory" }
 
   subject { FactoryGirl::Registry.new(registry_name) }

data/spec/factory_girl/sequence_spec.rb

@@ -5,10 +5,9 @@ describe FactoryGirl::Sequence do
     let(:name) { :test }
     subject    { FactoryGirl::Sequence.new(name) {|n| "=#{n}" } }
 
-    its(:name)             { should == name }
-    its(:names)            { should == [name] }
-    its(:next)             { should == "=1" }
-    its(:default_strategy) { should == :create }
+    its(:name)  { should == name }
+    its(:names) { should == [name] }
+    its(:next)  { should == "=1" }
 
     describe "when incrementing" do
       before     { subject.next }

data/spec/factory_girl/strategy/attributes_for_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe FactoryGirl::Strategy::AttributesFor do
-  let(:result)             { { :name => "John Doe", :gender => "Male", :admin => false } }
-  let(:attribute_assigner) { stub("attribute assigner", :hash => result) }
+  let(:result)             { { name: "John Doe", gender: "Male", admin: false } }
+  let(:attribute_assigner) { stub("attribute assigner", hash: result) }
 
   it_should_behave_like "strategy without association support"
 

data/spec/factory_girl/strategy/build_spec.rb

@@ -3,5 +3,5 @@ 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 callbacks", :after_build
-  it_should_behave_like "strategy with :strategy => :build", FactoryGirl::Strategy::Build
+  it_should_behave_like "strategy with strategy: :build", FactoryGirl::Strategy::Build
 end

data/spec/factory_girl/strategy/create_spec.rb

@@ -7,7 +7,7 @@ describe FactoryGirl::Strategy::Create do
   it "runs a custom create block" do
     block_run = false
     block = lambda {|instance| block_run = true }
-    subject.result(stub("assigner", :object => stub("result instance")), block)
+    subject.result(stub("assigner", object: stub("result instance")), block)
     block_run.should be_true
   end
 end

data/spec/factory_girl/strategy/stub_spec.rb

@@ -3,7 +3,7 @@ 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 callbacks", :after_stub
-  it_should_behave_like "strategy with :strategy => :build", FactoryGirl::Strategy::Stub
+  it_should_behave_like "strategy with strategy: :build", FactoryGirl::Strategy::Stub
 
   context "asking for a result" do
     before { Timecop.freeze(Time.now) }
@@ -14,7 +14,7 @@ describe FactoryGirl::Strategy::Stub do
       end.new
     end
 
-    let(:assigner)  { stub("attribute assigner", :object => result_instance) }
+    let(:assigner)  { stub("attribute assigner", object: result_instance) }
     let(:to_create) { lambda {|instance| instance } }
 
     it { subject.result(assigner, to_create).should_not be_new_record }

data/spec/spec_helper.rb

@@ -5,6 +5,9 @@ require 'rubygems'
 require 'rspec'
 require 'rspec/autorun'
 
+require "simplecov"
+SimpleCov.start
+
 require 'factory_girl'
 require "mocha"
 require "bourne"

data/spec/support/macros/define_constant.rb

@@ -70,8 +70,8 @@ RSpec.configure do |config|
 
   config.before(:all) do
     ActiveRecord::Base.establish_connection(
-      :adapter  => 'sqlite3',
-      :database => File.join(File.dirname(__FILE__), 'test.db')
+      adapter:  'sqlite3',
+      database: File.join(File.dirname(__FILE__), 'test.db')
     )
   end
 

data/spec/support/shared_examples/strategy.rb

@@ -26,54 +26,44 @@ shared_examples_for "strategy with association support" do |factory_girl_strateg
   end
 
   before do
-    FactoryGirl.stubs(:factory_by_name => factory)
+    FactoryGirl.stubs(factory_by_name: factory)
     factory.stubs(:compile)
     factory.stubs(:run)
   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_class, great: "value")
+    factory.should have_received(:run).with(factory_girl_strategy_class, 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_class, 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_class|
   let(:factory) { stub("associate_factory") }
 
   def association_named(name, overrides)
-    strategy = FactoryGirl::StrategyCalculator.new(overrides[:strategy] || overrides[:method]).strategy
-    runner = FactoryGirl::FactoryRunner.new(name, strategy, [overrides.except(:strategy, :method)])
+    strategy = FactoryGirl::StrategyCalculator.new(overrides[:strategy]).strategy
+    runner = FactoryGirl::FactoryRunner.new(name, strategy, [overrides.except(:strategy)])
     subject.association(runner)
   end
 
   before do
-    FactoryGirl.stubs(:factory_by_name => factory)
+    FactoryGirl.stubs(factory_by_name: factory)
     factory.stubs(:compile)
     factory.stubs(:run)
   end
 
   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" })
+    association_named(:author, strategy: :build, great: "value")
+    factory.should have_received(:run).with(factory_girl_strategy_class, { great: "value" })
   end
 
   it "finds the factory with the correct factory name" do
-    association_named(:author, :strategy => :build, :great => "value")
-    FactoryGirl.should have_received(:factory_by_name).with(:author)
-  end
-
-  it "runs the factory with the correct overrides with :method" do
-    association_named(:author, :method => :build, :great => "value")
-    factory.should have_received(:run).with(factory_girl_strategy_class, { :great => "value" })
-  end
-
-  it "finds the factory with the correct factory name with :method" do
-    association_named(:author, :method => :build, :great => "value")
+    association_named(:author, strategy: :build, great: "value")
     FactoryGirl.should have_received(:factory_by_name).with(:author)
   end
 end
@@ -99,7 +89,7 @@ shared_examples_for "strategy with callbacks" do |*callback_names|
     end.new
   end
 
-  let(:assigner) { stub("attribute assigner", :object => result_instance) }
+  let(:assigner) { stub("attribute assigner", object: result_instance) }
 
   before { subject.add_observer(callback_observer) }
 

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 2.6.4
-  prerelease: 
+  version: 3.0.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Josh Clayton
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-16 00:00:00.000000000 Z
+date: 2012-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70301124622100 !ruby/object:Gem::Requirement
+  requirement: &70291930464900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.3.9
+        version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70301124622100
+  version_requirements: *70291930464900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70301124620680 !ruby/object:Gem::Requirement
+  requirement: &70291930463360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *70301124620680
+  version_requirements: *70291930463360
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70301124619560 !ruby/object:Gem::Requirement
+  requirement: &70291930461720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *70301124619560
+  version_requirements: *70291930461720
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &70301124635340 !ruby/object:Gem::Requirement
+  requirement: &70291930461040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124635340
+  version_requirements: *70291930461040
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70301124634520 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70291930459800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124634520
+  version_requirements: *70291930459800
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70301124633060 !ruby/object:Gem::Requirement
+  requirement: &70291930458700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124633060
+  version_requirements: *70291930458700
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70301124631940 !ruby/object:Gem::Requirement
+  requirement: &70291930330920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124631940
+  version_requirements: *70291930330920
 - !ruby/object:Gem::Dependency
   name: bourne
-  requirement: &70301124630000 !ruby/object:Gem::Requirement
+  requirement: &70291930329740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124630000
+  version_requirements: *70291930329740
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70301124629000 !ruby/object:Gem::Requirement
+  requirement: &70291930328760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: 0.3.8
   type: :development
   prerelease: false
-  version_requirements: *70301124629000
+  version_requirements: *70291930328760
 - !ruby/object:Gem::Dependency
   name: sqlite3-ruby
-  requirement: &70301124628220 !ruby/object:Gem::Requirement
+  requirement: &70291930327820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124628220
+  version_requirements: *70291930327820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70301124642860 !ruby/object:Gem::Requirement
+  requirement: &70291930326540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124642860
+  version_requirements: *70291930326540
 - !ruby/object:Gem::Dependency
   name: bluecloth
-  requirement: &70301124641880 !ruby/object:Gem::Requirement
+  requirement: &70291930325800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,7 +143,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70301124641880
+  version_requirements: *70291930325800
 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 +177,6 @@ files:
 - features/support/env.rb
 - features/support/factories.rb
 - gemfiles/2.3.gemfile
-- gemfiles/2.3.gemfile.lock
 - gemfiles/3.0.gemfile
 - gemfiles/3.0.gemfile.lock
 - gemfiles/3.1.gemfile
@@ -202,7 +201,6 @@ files:
 - lib/factory_girl/declaration_list.rb
 - lib/factory_girl/definition.rb
 - lib/factory_girl/definition_proxy.rb
-- lib/factory_girl/deprecated.rb
 - lib/factory_girl/errors.rb
 - lib/factory_girl/evaluator.rb
 - lib/factory_girl/evaluator_class_definer.rb
@@ -244,14 +242,12 @@ files:
 - spec/acceptance/callbacks_spec.rb
 - spec/acceptance/create_list_spec.rb
 - spec/acceptance/create_spec.rb
-- spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/define_child_before_parent_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
-- spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
@@ -275,7 +271,6 @@ files:
 - spec/factory_girl/declaration_list_spec.rb
 - spec/factory_girl/definition_proxy_spec.rb
 - spec/factory_girl/definition_spec.rb
-- spec/factory_girl/deprecated_spec.rb
 - spec/factory_girl/evaluator_class_definer_spec.rb
 - spec/factory_girl/factory_spec.rb
 - spec/factory_girl/find_definitions_spec.rb
@@ -308,13 +303,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.16
@@ -331,7 +326,6 @@ test_files:
 - features/support/env.rb
 - features/support/factories.rb
 - gemfiles/2.3.gemfile
-- gemfiles/2.3.gemfile.lock
 - gemfiles/3.0.gemfile
 - gemfiles/3.0.gemfile.lock
 - gemfiles/3.1.gemfile
@@ -350,14 +344,12 @@ test_files:
 - spec/acceptance/callbacks_spec.rb
 - spec/acceptance/create_list_spec.rb
 - spec/acceptance/create_spec.rb
-- spec/acceptance/default_strategy_spec.rb
 - spec/acceptance/define_child_before_parent_spec.rb
 - spec/acceptance/definition_spec.rb
 - spec/acceptance/definition_without_block_spec.rb
 - spec/acceptance/initialize_with_spec.rb
 - spec/acceptance/modify_factories_spec.rb
 - spec/acceptance/modify_inherited_spec.rb
-- spec/acceptance/nested_attributes_spec.rb
 - spec/acceptance/overrides_spec.rb
 - spec/acceptance/parent_spec.rb
 - spec/acceptance/sequence_spec.rb
@@ -381,7 +373,6 @@ 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/deprecated_spec.rb
 - spec/factory_girl/evaluator_class_definer_spec.rb
 - spec/factory_girl/factory_spec.rb
 - spec/factory_girl/find_definitions_spec.rb

data/gemfiles/2.3.gemfile.lock

@@ -1,72 +0,0 @@
-PATH
-  remote: /Users/joshuaclayton/dev/gems/factory_girl
-  specs:
-    factory_girl (2.6.4)
-      activesupport (>= 2.3.9)
-
-GEM
-  remote: http://rubygems.org/
-  specs:
-    activerecord (2.3.12)
-      activesupport (= 2.3.12)
-    activesupport (2.3.12)
-    appraisal (0.3.8)
-      bundler
-      rake
-    aruba (0.3.7)
-      childprocess (>= 0.1.9)
-      cucumber (>= 0.10.5)
-      rspec (>= 2.6.0)
-    bluecloth (2.1.0)
-    bourne (1.0)
-      mocha (= 0.9.8)
-    builder (3.0.0)
-    childprocess (0.1.9)
-      ffi (~> 1.0.6)
-    cucumber (1.0.0)
-      builder (>= 2.1.2)
-      diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.1)
-      json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    diff-lcs (1.1.2)
-    ffi (1.0.9)
-    gherkin (2.4.1)
-      json (>= 1.4.6)
-    json (1.5.3)
-    mocha (0.9.8)
-      rake
-    rake (0.9.2)
-    rcov (0.9.9)
-    rspec (2.6.0)
-      rspec-core (~> 2.6.0)
-      rspec-expectations (~> 2.6.0)
-      rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.4)
-    rspec-expectations (2.6.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.6.0)
-    sqlite3 (1.3.3)
-    sqlite3-ruby (1.3.3)
-      sqlite3 (>= 1.3.3)
-    term-ansicolor (1.0.5)
-    timecop (0.3.5)
-    yard (0.7.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord (~> 2.3)
-  appraisal (~> 0.3.8)
-  aruba
-  bluecloth
-  bourne
-  cucumber (~> 1.0.0)
-  factory_girl!
-  mocha
-  rcov
-  rspec (~> 2.0)
-  sqlite3-ruby
-  timecop
-  yard