gabrielg-factory_girl 1.2.0 → 1.2.1

data/lib/factory_girl/factory.rb

@@ -126,8 +126,8 @@ class Factory
     add_attribute(name) { |a| a.association(association_factory, {}, {:count => options[:count]}) }
   end
 
-  def attributes_for (attrs = {}) #:nodoc:
-    build_attributes_hash(attrs, :attributes_for)
+  def attributes_for (attrs = {}, strategy_override = :attributes_for) #:nodoc:
+    build_attributes_hash(attrs, strategy_override)
   end
 
   def build (attrs = {}) #:nodoc:
@@ -252,7 +252,7 @@ class Factory
       vals[attribute.name] = attribute.value(proxy)
       vals
     end
-    inherited_factory ? inherited_factory.attributes_for.merge(attrs) : attrs
+    inherited_factory ? inherited_factory.attributes_for({}, strategy).merge(attrs) : attrs
   end
 
   def build_instance (override, strategy)

data/test/factory_test.rb

@@ -80,12 +80,16 @@ class FactoryTest < Test::Unit::TestCase
     context "when inheriting from a prior factory" do
       setup do
         @factory.foo "bar"
-        @factory.snafu "foo"
+        @factory.snafu { "foo" }
         @new_factory = Factory.new(:user_with_stuff, :inherit => @factory)
         @new_factory.foo "fighters"
         @instance = @new_factory.build
       end
 
+      teardown do
+        Factory.factories = {}
+      end
+
       should "use subfactory's class if not specified" do
         assert_equal User, @factory.build_class
       end
@@ -103,19 +107,36 @@ class FactoryTest < Test::Unit::TestCase
         assert_equal "foo", @instance.snafu
       end
 
+      should "also inherit associations" do
+        Factory.define(:user) do |u|
+          u.first_name "Joe"
+          u.last_name "Bloggs"
+          u.email "joe@example.com"
+        end
+
+        factory = Factory.new(:post)
+        factory.association(:author, :factory => :user)
+        inherited = Factory.new(:post_with_stuff, :inherit => factory)
+        instance = inherited.build
+        assert_instance_of User, instance.author
+      end
+
     end
 
     context "when defining an inheriting factory" do
       setup do
-        @original_user_with_stuff_factory = Factory.factories[:user_with_stuff]
+        Factory.define(:user) do |u|
+          u.first_name "Joe"
+          u.last_name "Bloggs"
+          u.email "joe@example.com"
+        end
       end
 
       teardown do
-        Factory.factories[:user_with_stuff] = @original_user_with_stuff_factory
+        Factory.factories = {}
       end
 
       should "pass in an instance of the inherited factory as the inherited_factory" do
-        assert_not_nil Factory.factories[:user]
         instance = Factory.define(:user_with_stuff, :inherit => :user) {}
         assert_equal Factory.factories[:user], instance.inherited_factory
       end
@@ -307,6 +328,10 @@ class FactoryTest < Test::Unit::TestCase
         @user = Factory(:user)
       end
 
+      teardown do
+        Factory.factories = {}
+      end
+
       should "set up five associated post objects" do
         assert_equal 5, @user.posts.size
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gabrielg-factory_girl
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Joe Ferris