Error was being raised when passing nil to create, fixed.

zenhob · Jun 4, 2009 · b2f2b8b · b2f2b8b
1 parent 8e854f7
commit b2f2b8b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/modelfactory/factory.rb b/lib/modelfactory/factory.rb
@@ -34,13 +34,13 @@ def next_counter
       @counter += 1
     end
 
-    def new_named(name, opt = {}, &block)
+    def new_named(name, opt, &block)
       instance = @class.new
       InstanceBuilder.new(instance, opt, next_counter, &@options[name])
       instance
     end
 
-    def create_named(name, opt = {}, &block)
+    def create_named(name, opt, &block)
       instance = new_named(name, opt, &block)
       instance.save!
       instance.reload
@@ -52,7 +52,7 @@ def create_named(name, opt = {}, &block)
   class InstanceBuilder # :nodoc:
     def initialize(instance, params, counter, &block)
       @instance = instance
-      @params = params
+      @params = params || {}
       @counter = counter
       @params.each { |attr, value| @instance.send "#{attr}=", value }
       instance_eval(&block) if block_given?

diff --git a/test/modelfactory_test.rb b/test/modelfactory_test.rb
@@ -15,6 +15,10 @@ class ModelFactoryTest < Test::Unit::TestCase
     assert_raises(ActiveRecord::RecordInvalid) { StrictWidget.factory.create }
   end
 
+  should "not raise on nil params" do
+    assert_nothing_raised { Widget.factory.create(nil) }
+  end
+
   context "with a specified default" do
     setup do
       ModelFactory.configure do