factory_girl 3.5.0 → 3.6.0

data/.travis.yml

@@ -1,9 +1,12 @@
 rvm:
   - 1.9.2
   - 1.9.3
+  - jruby-19mode
 before_install:
   - gem update --system
 script: "bundle exec rake spec:unit spec:acceptance features"
+jdk:
+  - openjdk6
 gemfile:
   - gemfiles/3.0.gemfile
   - gemfiles/3.1.gemfile

data/GETTING_STARTED.md

@@ -16,6 +16,13 @@ If you're *not* using Rails, you'll just have to change the required version of
 gem "factory_girl", "~> 3.0"
 ```
 
+JRuby users: FactoryGirl works with JRuby starting with 1.6.7.2 (latest stable, as per July 2012).
+JRuby has to be used in 1.9 mode, for that, use JRUBY_OPTS environment variable:
+
+```
+export JRUBY_OPTS=--1.9
+```
+
 Once your Gemfile is updated, you'll want to update your bundle.
 
 Using Without Bundler
@@ -141,7 +148,9 @@ end
 World(FactoryGirl::Syntax::Methods)
 ```
 
-This would allow you to write:
+This allows you to use the core set of syntax methods (`build`,
+`build_stubbed`, `create`, `attributes_for`, and their `*_list` counterparts)
+without having to call them on FactoryGirl directly:
 
 ```ruby
 describe User, "#full_name" do
@@ -258,8 +267,8 @@ Static and dynamic attributes can be ignored. Ignored attributes will be ignored
 within attributes\_for and won't be set on the model, even if the attribute
 exists or you attempt to override it.
 
-Within Factory Girl's dynamic attributes, you can access ignored attributes as
-you would expect. If you need to access the evaluator in a Factory Girl callback,
+Within FactoryGirl's dynamic attributes, you can access ignored attributes as
+you would expect. If you need to access the evaluator in a FactoryGirl callback,
 you'll need to declare a second block argument (for the evaluator) and access
 ignored attributes from there.
 
@@ -690,7 +699,7 @@ Instead of creating a child factory that added additional attributes:
 ```ruby
 FactoryGirl.define do
   factory :application_user, parent: :user do
-    full_name     { Faker::Name.name }
+    full_name     "Jane Doe"
     date_of_birth { 21.years.ago }
     gender        "Female"
     health        90
@@ -703,7 +712,7 @@ You could modify that factory instead.
 ```ruby
 FactoryGirl.modify do
   factory :user do
-    full_name     { Faker::Name.name }
+    full_name     "Jane Doe"
     date_of_birth { 21.years.ago }
     gender        "Female"
     health        90
@@ -758,14 +767,14 @@ sequence(:name) {|n| "person#{n}@example.com" }
 
 factory :user do
   ignore do
-    name { Faker::Name.name }
+    name "Jane Doe"
   end
 
   email
   initialize_with { new(name) }
 end
 
-FactoryGirl.build(:user).name # Bob Hope
+FactoryGirl.build(:user).name # Jane Doe
 ```
 
 Notice that I ignored the `name` attribute. If you don't want attributes
@@ -793,7 +802,7 @@ For example:
 ```ruby
 factory :user do
   ignore do
-    name { Faker::Name.name }
+    name "John Doe"
   end
 
   initialize_with { User.build_with_name(name) }
@@ -809,7 +818,7 @@ factory :user do
     comments_count 5
   end
 
-  name { Faker::Name.name }
+  name "John Doe"
 
   initialize_with { new(attributes) }
 end
@@ -1005,6 +1014,9 @@ factory\_girl ships with step definitions that make calling factories from Cucum
 require "factory_girl/step_definitions"
 ```
 
+Note: These step definitions are _deprecated_. Read why here:
+http://robots.thoughtbot.com/post/25650434584/writing-better-cucumber-scenarios-or-why-were
+
 Alternate Syntaxes
 ------------------
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -27,7 +27,6 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    bluecloth (2.2.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
@@ -41,10 +40,14 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.11)
+    ffi (1.0.11-java)
     gherkin (2.9.3)
       json (>= 1.4.6)
+    gherkin (2.9.3-java)
+      json (>= 1.4.6)
     i18n (0.6.0)
     json (1.7.0)
+    json (1.7.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -71,13 +74,13 @@ GEM
     yard (0.8.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord
   appraisal (~> 0.4)
   aruba
-  bluecloth
   bourne
   cucumber (~> 1.1)
   factory_girl!

data/NEWS

@@ -1,3 +1,12 @@
+3.6.0 (July 27, 2012)
+  Code/spec cleanup
+  Allow factories with traits to be used in associations
+  Refactor Factory to use DefinitionHierarchy to handle managing callbacks,
+    custom constructor, and custom to_create
+  Add memoization to speed up factories providing attribute overrides
+  Add initial support of JRuby when running in 1.9 mode
+  Improve docs on what happens when including FactoryGirl::Syntax::Methods
+
 3.5.0 (June 22, 2012)
   Allow created_at to be set when using build_stubbed
   Deprecate FactoryGirl step definitions
@@ -104,14 +113,14 @@
   Fix inline traits
 
 2.4.0 (January 13, 2012)
-  Refactor internals of Factory Girl to use anonymous class on which attributes
+  Refactor internals of FactoryGirl to use anonymous class on which attributes
     get defined
   Explicitly require Ruby 1.8.7 or higher in gemspec
   Fix documentation
   Add Gemnasium status to documentation
   Supplying a Class to a factory that overrides to_s no longer results in
     getting the wrong Class constructed
-  Be more agnostic about ORMs when using columns in Factory Girl step
+  Be more agnostic about ORMs when using columns in FactoryGirl step
     definitions
   Test against Active Record 3.2.0.rc2
   Update GETTING_STARTED to use Ruby syntax highlighting

data/README.md

@@ -28,9 +28,9 @@ and run `bundle install` from your shell.
 Supported Ruby versions
 -----------------------
 
-The Factory Girl 3.x series supports Ruby 1.9.x.
+The FactoryGirl 3.x series supports Ruby 1.9.x.
 
-For older versions of Ruby, please use the Factory Girl 2.x series.
+For older versions of Ruby, please use the FactoryGirl 2.x series.
 
 More Information
 ----------------

data/factory_girl.gemspec

@@ -31,8 +31,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency("mocha")
   s.add_development_dependency("bourne")
   s.add_development_dependency("appraisal", "~> 0.4")
-  s.add_development_dependency("sqlite3-ruby")
+
+  if RUBY_PLATFORM == "java"
+    s.add_development_dependency("activerecord-jdbcsqlite3-adapter")
+    s.add_development_dependency("jdbc-sqlite3")
+  else
+    s.add_development_dependency("sqlite3-ruby")
+  end
+
   s.add_development_dependency("yard")
-  s.add_development_dependency("bluecloth")
 end
 

data/features/factory_girl_steps.feature

@@ -207,7 +207,7 @@ Feature: Use step definitions generated by factories
       | id  | name |
       | 123 | Joe  |
 
-  Scenario: pass a factory girl table as an argument and modify it
+  Scenario: pass a FactoryGirl table as an argument and modify it
     Given these super users exist:
       | id  | Name |
       | 123 | Joe  |

data/features/find_definitions.feature

@@ -1,4 +1,4 @@
-Feature: Factory girl can find factory definitions correctly
+Feature: FactoryGirl can find factory definitions correctly
   Scenario: Find definitions with a path
     Given a file named "awesome_factories.rb" with:
     """
@@ -8,8 +8,8 @@ Feature: Factory girl can find factory definitions correctly
       end
     end
     """
-    When "awesome_factories.rb" is added to Factory Girl's file definitions path
-    And I create a "awesome_category" instance from Factory Girl
+    When "awesome_factories.rb" is added to FactoryGirl's file definitions path
+    And I create a "awesome_category" instance from FactoryGirl
     Then I should find the following for the last category:
       | name       |
       | awesome!!! |
@@ -23,8 +23,8 @@ Feature: Factory girl can find factory definitions correctly
       end
     end
     """
-    When "awesome_factories.rb" is added to Factory Girl's file definitions path as an absolute path
-    And I create a "another_awesome_category" instance from Factory Girl
+    When "awesome_factories.rb" is added to FactoryGirl's file definitions path as an absolute path
+    And I create a "another_awesome_category" instance from FactoryGirl
     Then I should find the following for the last category:
       | name       |
       | awesome!!! |
@@ -38,13 +38,13 @@ Feature: Factory girl can find factory definitions correctly
       end
     end
     """
-    When "nested" is added to Factory Girl's file definitions path
-    And I create a "great_category" instance from Factory Girl
+    When "nested" is added to FactoryGirl's file definitions path
+    And I create a "great_category" instance from FactoryGirl
     Then I should find the following for the last category:
       | name     |
       | great!!! |
 
-  Scenario: Reload Factory Girl
+  Scenario: Reload FactoryGirl
     Given a file named "nested/reload_factories.rb" with:
     """
     FactoryGirl.define do
@@ -58,7 +58,7 @@ Feature: Factory girl can find factory definitions correctly
       end
     end
     """
-    When "nested" is added to Factory Girl's file definitions path
+    When "nested" is added to FactoryGirl's file definitions path
     And I append to "nested/reload_factories.rb" with:
     """
 
@@ -69,7 +69,7 @@ Feature: Factory girl can find factory definitions correctly
     end
     """
     And I reload factories
-    And I create a "handy_category" instance from Factory Girl
+    And I create a "handy_category" instance from FactoryGirl
     Then I should find the following for the last category:
       | name     |
       | HANDY!!! |

data/features/step_definitions/factory_girl_steps.rb

@@ -7,7 +7,7 @@ end
 
 World(FactoryGirlDefinitionsHelper)
 
-When /^"([^"]*)" is added to Factory Girl's file definitions path$/ do |file_name|
+When /^"([^"]*)" is added to FactoryGirl's file definitions path$/ do |file_name|
   new_factory_file = File.join(current_dir, file_name.gsub(".rb", ""))
 
   append_file_to_factory_girl_definitions_path(new_factory_file)
@@ -15,7 +15,7 @@ When /^"([^"]*)" is added to Factory Girl's file definitions path$/ do |file_nam
   step %{I find definitions}
 end
 
-When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute path$/ do |file_name|
+When /^"([^"]*)" is added to FactoryGirl's file definitions path as an absolute path$/ do |file_name|
   new_factory_file = File.expand_path(File.join(current_dir, file_name.gsub(".rb", "")))
 
   append_file_to_factory_girl_definitions_path(new_factory_file)
@@ -23,7 +23,7 @@ When /^"([^"]*)" is added to Factory Girl's file definitions path as an absolute
   step %{I find definitions}
 end
 
-When /^I create a "([^"]*)" instance from Factory Girl$/ do |factory_name|
+When /^I create a "([^"]*)" instance from FactoryGirl$/ do |factory_name|
   FactoryGirl.create(factory_name)
 end
 

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -26,7 +26,6 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    bluecloth (2.2.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (2.1.2)
@@ -40,10 +39,14 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.11)
+    ffi (1.0.11-java)
     gherkin (2.9.3)
       json (>= 1.4.6)
+    gherkin (2.9.3-java)
+      json (>= 1.4.6)
     i18n (0.5.0)
     json (1.7.0)
+    json (1.7.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -70,13 +73,13 @@ GEM
     yard (0.8.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.0.0)
   appraisal (~> 0.4)
   aruba
-  bluecloth
   bourne
   cucumber (~> 1.1)
   factory_girl!

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -27,7 +27,6 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    bluecloth (2.2.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
@@ -41,10 +40,14 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.11)
+    ffi (1.0.11-java)
     gherkin (2.9.3)
       json (>= 1.4.6)
+    gherkin (2.9.3-java)
+      json (>= 1.4.6)
     i18n (0.6.0)
     json (1.7.0)
+    json (1.7.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -71,13 +74,13 @@ GEM
     yard (0.8.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.1.0)
   appraisal (~> 0.4)
   aruba
-  bluecloth
   bourne
   cucumber (~> 1.1)
   factory_girl!

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.5.0)
+    factory_girl (3.6.0)
       activesupport (>= 3.0.0)
 
 GEM
@@ -27,7 +27,6 @@ GEM
       cucumber (>= 1.1.1)
       ffi (>= 1.0.11)
       rspec (>= 2.7.0)
-    bluecloth (2.2.0)
     bourne (1.1.2)
       mocha (= 0.10.5)
     builder (3.0.0)
@@ -41,10 +40,14 @@ GEM
       term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.11)
+    ffi (1.0.11-java)
     gherkin (2.9.3)
       json (>= 1.4.6)
+    gherkin (2.9.3-java)
+      json (>= 1.4.6)
     i18n (0.6.0)
     json (1.7.0)
+    json (1.7.0-java)
     metaclass (0.0.1)
     mocha (0.10.5)
       metaclass (~> 0.0.1)
@@ -71,13 +74,13 @@ GEM
     yard (0.8.1)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   activerecord (~> 3.2.0)
   appraisal (~> 0.4)
   aruba
-  bluecloth
   bourne
   cucumber (~> 1.1)
   factory_girl!

data/lib/factory_girl.rb

@@ -2,6 +2,7 @@ require 'set'
 require 'active_support/core_ext/module/delegation'
 require 'active_support/notifications'
 
+require 'factory_girl/definition_hierarchy'
 require 'factory_girl/configuration'
 require 'factory_girl/errors'
 require 'factory_girl/factory_runner'
@@ -41,6 +42,7 @@ require 'factory_girl/decorator/class_key_hash'
 require 'factory_girl/decorator/disallows_duplicates_registry'
 require 'factory_girl/decorator/invocation_tracker'
 require 'factory_girl/decorator/invocation_ignorer'
+require 'factory_girl/decorator/new_constructor'
 require 'factory_girl/version'
 
 module FactoryGirl

data/lib/factory_girl/attribute/association.rb

@@ -13,7 +13,10 @@ module FactoryGirl
       def to_proc
         factory   = @factory
         overrides = @overrides
-        -> { association(factory, overrides) }
+        traits_and_overrides = [factory, overrides].flatten
+        factory_name = traits_and_overrides.shift
+
+        -> { association(factory_name, *traits_and_overrides) }
       end
 
       def association?

data/lib/factory_girl/attribute_assigner.rb

@@ -31,7 +31,13 @@ module FactoryGirl
     private
 
     def method_tracking_evaluator
-      @method_tracking_evaluator ||= Decorator::AttributeHash.new(invocation_decorator.new(@evaluator), attribute_names_to_assign)
+      @method_tracking_evaluator ||= Decorator::AttributeHash.new(decorated_evaluator, attribute_names_to_assign)
+    end
+
+    def decorated_evaluator
+      invocation_decorator.new(
+        Decorator::NewConstructor.new(@evaluator, @build_class)
+      )
     end
 
     def invocation_decorator
@@ -71,7 +77,7 @@ module FactoryGirl
     end
 
     def attribute_names_to_assign
-      non_ignored_attribute_names + override_names - ignored_attribute_names - alias_names_to_ignore
+      @attribute_names_to_assign ||= non_ignored_attribute_names + override_names - ignored_attribute_names - alias_names_to_ignore
     end
 
     def non_ignored_attribute_names

data/lib/factory_girl/callback.rb

@@ -5,7 +5,7 @@ module FactoryGirl
     def initialize(name, block)
       @name  = name.to_sym
       @block = block
-      check_name
+      ensure_valid_callback_name!
     end
 
     def run(instance, evaluator)
@@ -26,7 +26,7 @@ module FactoryGirl
 
     private
 
-    def check_name
+    def ensure_valid_callback_name!
       unless FactoryGirl.callback_names.include?(name)
         raise InvalidCallbackNameError, "#{name} is not a valid callback name. " +
           "Valid callback names are #{FactoryGirl.callback_names.inspect}"

data/lib/factory_girl/decorator/new_constructor.rb

@@ -0,0 +1,12 @@
+module FactoryGirl
+  class Decorator
+    class NewConstructor < Decorator
+      def initialize(component, build_class)
+        super(component)
+        @build_class = build_class
+      end
+
+      delegate :new, to: :@build_class
+    end
+  end
+end

data/lib/factory_girl/definition_hierarchy.rb

@@ -0,0 +1,39 @@
+module FactoryGirl
+  class DefinitionHierarchy
+    def callbacks
+      []
+    end
+
+    def constructor
+      FactoryGirl.constructor
+    end
+
+    def to_create
+      FactoryGirl.to_create
+    end
+
+    def self.add_callbacks(callbacks)
+      if callbacks.any?
+        define_method :callbacks do
+          super() + callbacks
+        end
+      end
+    end
+
+    def self.build_constructor(&block)
+      if block
+        define_method(:constructor) do
+          block
+        end
+      end
+    end
+
+    def self.build_to_create(&block)
+      if block
+        define_method(:to_create) do
+          block
+        end
+      end
+    end
+  end
+end

data/lib/factory_girl/evaluator.rb

@@ -10,8 +10,7 @@ module FactoryGirl
       undef_method(method) unless method =~ /^__|initialize/
     end
 
-    def initialize(build_class, build_strategy, overrides = {})
-      @build_class       = build_class
+    def initialize(build_strategy, overrides = {})
       @build_strategy    = build_strategy
       @overrides         = overrides
       @cached_attributes = overrides
@@ -21,12 +20,13 @@ module FactoryGirl
       end
     end
 
-    delegate :new, to: :@build_class
-
-    def association(factory_name, overrides = {})
+    def association(factory_name, *traits_and_overrides)
+      overrides = traits_and_overrides.extract_options!
       strategy_override = overrides.fetch(:strategy) { :create }
 
-      runner = FactoryRunner.new(factory_name, strategy_override, [overrides.except(:strategy)])
+      traits_and_overrides += [overrides.except(:strategy)]
+
+      runner = FactoryRunner.new(factory_name, strategy_override, traits_and_overrides)
       @build_strategy.association(runner)
     end
 

data/lib/factory_girl/factory.rb

@@ -33,7 +33,7 @@ module FactoryGirl
 
       strategy = StrategyCalculator.new(build_strategy).strategy.new
 
-      evaluator = evaluator_class.new(build_class, strategy, overrides.symbolize_keys)
+      evaluator = evaluator_class.new(strategy, overrides.symbolize_keys)
       attribute_assigner = AttributeAssigner.new(evaluator, build_class, &compiled_constructor)
 
       evaluation = Evaluation.new(attribute_assigner, compiled_to_create)
@@ -84,6 +84,7 @@ module FactoryGirl
         parent.compile
         parent.defined_traits.each {|trait| define_trait(trait) }
         @definition.compile
+        build_hierarchy
         @compiled = true
       end
     end
@@ -111,16 +112,30 @@ module FactoryGirl
       end
     end
 
+    def hierarchy_class
+      @hierarchy_class ||= Class.new(parent.hierarchy_class)
+    end
+
+    def hierarchy_instance
+      @hierarchy_instance ||= hierarchy_class.new
+    end
+
+    def build_hierarchy
+      hierarchy_class.build_to_create &definition.to_create
+      hierarchy_class.build_constructor &definition.constructor
+      hierarchy_class.add_callbacks definition.callbacks
+    end
+
     def callbacks
-      parent.callbacks + definition.callbacks
+      hierarchy_instance.callbacks
     end
 
     def compiled_to_create
-      @definition.to_create || parent.compiled_to_create || FactoryGirl.to_create
+      hierarchy_instance.to_create
     end
 
     def compiled_constructor
-      @definition.constructor || parent.compiled_constructor || FactoryGirl.constructor
+      hierarchy_instance.constructor
     end
 
     private
@@ -141,6 +156,9 @@ module FactoryGirl
       super
       @definition = @definition.clone
       @evaluator_class = nil
+      @hierarchy_class = nil
+      @hierarchy_instance = nil
+      @compiled = false
     end
   end
 end

data/lib/factory_girl/null_factory.rb

@@ -10,10 +10,9 @@ module FactoryGirl
     delegate :defined_traits, :callbacks, :attributes, :constructor,
       :to_create, to: :definition
 
-    def compiled_to_create; to_create; end
-    def compiled_constructor; constructor; end
     def compile; end
     def class_name; end
     def evaluator_class; FactoryGirl::Evaluator; end
+    def hierarchy_class; FactoryGirl::DefinitionHierarchy; end
   end
 end

data/lib/factory_girl/null_object.rb

@@ -16,5 +16,9 @@ module FactoryGirl
     def respond_to?(method, include_private=false)
       @methods_to_respond_to.include? method.to_s
     end
+
+    def respond_to_missing?(*args)
+      false
+    end
   end
 end

data/lib/factory_girl/version.rb

@@ -1,3 +1,3 @@
 module FactoryGirl
-  VERSION = '3.5.0'
+  VERSION = '3.6.0'
 end

data/spec/acceptance/build_stubbed_spec.rb

@@ -118,8 +118,6 @@ describe "defaulting `created_at`" do
     Timecop.freeze Time.now
   end
 
-  after { Timecop.return }
-
   it "defaults created_at for objects with created_at" do
     build_stubbed(:thing_with_timestamp).created_at.should == Time.now
   end

data/spec/acceptance/traits_spec.rb

@@ -669,3 +669,32 @@ describe "implicit traits containing callbacks" do
     FactoryGirl.build(:user_with_trait_with_callback).value.should == 1
   end
 end
+
+describe "traits used in associations" do
+  before do
+    define_model("User", admin: :boolean, name: :string)
+    define_model("Post", author_id: :integer) do
+      belongs_to :author, class_name: 'User'
+    end
+
+    FactoryGirl.define do
+      factory :user do
+        admin false
+
+        trait :admin do
+          admin true
+        end
+      end
+
+      factory :post do
+        association :author, factory: [:user, :admin], name: 'John Doe'
+      end
+    end
+  end
+
+  it "allows assigning traits for the factory of an association" do
+    author = FactoryGirl.create(:post).author
+    author.should be_admin
+    author.name.should == 'John Doe'
+  end
+end

data/spec/factory_girl/evaluator_class_definer_spec.rb

@@ -7,7 +7,7 @@ describe FactoryGirl::EvaluatorClassDefiner do
 
   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(Object, stub("build strategy", add_observer: true)) }
+  let(:evaluator)     { class_definer.evaluator_class.new(stub("build strategy", add_observer: true)) }
 
   it "returns an evaluator when accessing the evaluator class" do
     evaluator.should be_a(FactoryGirl::Evaluator)

data/spec/factory_girl/strategy/stub_spec.rb

@@ -7,7 +7,6 @@ describe FactoryGirl::Strategy::Stub do
 
   context "asking for a result" do
     before { Timecop.freeze(Time.now) }
-    after  { Timecop.return }
     let(:result_instance) do
       define_class("ResultInstance") do
         attr_accessor :id

data/spec/spec_helper.rb

@@ -20,6 +20,7 @@ RSpec.configure do |config|
   config.include DeclarationMatchers
 
   config.after do
+    Timecop.return
     FactoryGirl.reload
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-22 00:00:00.000000000 Z
+date: 2012-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -188,22 +188,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bluecloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  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."
@@ -267,7 +251,9 @@ files:
 - lib/factory_girl/decorator/disallows_duplicates_registry.rb
 - lib/factory_girl/decorator/invocation_ignorer.rb
 - lib/factory_girl/decorator/invocation_tracker.rb
+- lib/factory_girl/decorator/new_constructor.rb
 - lib/factory_girl/definition.rb
+- lib/factory_girl/definition_hierarchy.rb
 - lib/factory_girl/definition_proxy.rb
 - lib/factory_girl/errors.rb
 - lib/factory_girl/evaluation.rb