factory_girl 3.4.2 → 3.5.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    factory_girl (3.4.2)
+    factory_girl (3.5.0)
       activesupport (>= 3.0.0)
 
 GEM

data/NEWS

@@ -1,4 +1,8 @@
-3.4.2 (June 12, 2012)
+3.5.0 (June 22, 2012)
+  Allow created_at to be set when using build_stubbed
+  Deprecate FactoryGirl step definitions
+
+3.4.2 (June 19, 2012)
   Fix bug in traits with callbacks called implicitly in factories whose
     callbacks trigger multiple times
 

data/gemfiles/3.0.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.4.2)
+    factory_girl (3.5.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.4.2)
+    factory_girl (3.5.0)
       activesupport (>= 3.0.0)
 
 GEM

data/gemfiles/3.2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: /Users/joshuaclayton/dev/gems/factory_girl
   specs:
-    factory_girl (3.4.2)
+    factory_girl (3.5.0)
       activesupport (>= 3.0.0)
 
 GEM

data/lib/factory_girl/step_definitions.rb

@@ -1,3 +1,5 @@
+require 'active_support/deprecation'
+
 # @api private
 module FactoryGirlStepHelpers
   def convert_human_hash_to_attribute_hash(human_hash, associations = [])
@@ -109,6 +111,8 @@ FactoryGirl.factories.each do |factory|
     end
 
     Given /^the following (?:#{human_name}|#{human_name.pluralize}) exists?:?$/i do |table|
+      ActiveSupport::Deprecation.warn %{The step 'Given the following #{human_name} exists:' is deprecated and will be removed in 4.0}
+
       table.hashes.each do |human_hash|
         attributes = convert_human_hash_to_attribute_hash(human_hash, factory.associations)
         FactoryGirl.create(factory.name, attributes)
@@ -116,10 +120,14 @@ FactoryGirl.factories.each do |factory|
     end
 
     Given /^an? #{human_name} exists$/i do
+      ActiveSupport::Deprecation.warn %{The step 'Given a #{human_name} exists' is deprecated and will be removed in 4.0}
+
       FactoryGirl.create(factory.name)
     end
 
     Given /^(\d+) #{human_name.pluralize} exist$/i do |count|
+      ActiveSupport::Deprecation.warn %{The step 'Given #{count} #{human_name.pluralize} exist' is deprecated and will be removed in 4.0}
+
       FactoryGirl.create_list(factory.name, count.to_i)
     end
 
@@ -127,10 +135,14 @@ FactoryGirl.factories.each do |factory|
       human_column_name = attribute_name.downcase.gsub('_', ' ')
 
       Given /^an? #{human_name} exists with an? #{human_column_name} of "([^"]*)"$/i do |value|
+        ActiveSupport::Deprecation.warn %{The step 'Given a #{human_name} exists with a #{human_column_name} of "#{value}"' is deprecated and will be removed in 4.0}
+
         FactoryGirl.create(factory.name, attribute_name => value)
       end
 
       Given /^(\d+) #{human_name.pluralize} exist with an? #{human_column_name} of "([^"]*)"$/i do |count, value|
+        ActiveSupport::Deprecation.warn %{The step 'Given #{count} #{human_name.pluralize} exists with a #{human_column_name} of "#{value}"' is deprecated and will be removed in 4.0}
+
         FactoryGirl.create_list(factory.name, count.to_i, attribute_name => value)
       end
     end

data/lib/factory_girl/strategy/stub.rb

@@ -22,15 +22,12 @@ module FactoryGirl
 
       def stub_database_interaction_on_result(result_instance)
         result_instance.id = next_id
+
         result_instance.instance_eval do
           def persisted?
             !new_record?
           end
 
-          def created_at
-            @created_at ||= Time.now
-          end
-
           def new_record?
             id.nil?
           end
@@ -55,6 +52,17 @@ module FactoryGirl
             raise 'stubbed models are not allowed to access the database'
           end
         end
+
+        created_at_missing_default = result_instance.respond_to?(:created_at) && !result_instance.created_at
+        result_instance_missing_created_at = !result_instance.respond_to?(:created_at)
+
+        if created_at_missing_default || result_instance_missing_created_at
+          result_instance.instance_eval do
+            def created_at
+              @created_at ||= Time.now
+            end
+          end
+        end
       end
     end
   end

data/lib/factory_girl/version.rb

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

data/spec/acceptance/build_stubbed_spec.rb

@@ -102,3 +102,38 @@ describe "calling `build_stubbed` with a block" do
     end.should == expected
   end
 end
+
+describe "defaulting `created_at`" do
+  include FactoryGirl::Syntax::Methods
+
+  before do
+    define_model('ThingWithTimestamp', created_at: :datetime)
+    define_model('ThingWithoutTimestamp')
+
+    FactoryGirl.define do
+      factory :thing_with_timestamp
+      factory :thing_without_timestamp
+    end
+
+    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
+
+  it "adds created_at to objects who don't have the method" do
+    build_stubbed(:thing_without_timestamp).should respond_to(:created_at)
+  end
+
+  it "allows overriding created_at for objects with created_at" do
+    build_stubbed(:thing_with_timestamp, created_at: 3.days.ago).created_at.should == 3.days.ago
+  end
+
+  it "doesn't allow setting created_at on an object that doesn't define it" do
+    expect { build_stubbed(:thing_without_timestamp, :created_at => Time.now) }.to
+      raise_error(NoMethodError, /created_at=/)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: factory_girl
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-20 00:00:00.000000000 Z
+date: 2012-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport