@@ -45,8 +45,11 @@ A more complicated example: A value of :belongs_to_model on an attribute adds logic to call +create_+ or +build_+, appropriately. For example: -+build_user+ will call :role => build_role, while +create_user+ will call :role => create_role. -+valid_user_attributes+ will call +build_role+. + valid_user_attributes # assigns :role => build_role + build_user # assigns :role => build_role + + create_user # assigns :role => create_role + valid_user_attributes(true) # assigns :role => create_role In this way, models are not saved to the database unnecessarily. Note that if you pass a foreign key attribute as a build or create override, the corresponding default object will not be constructed. README.rdoc @@ -17,6 +17,6 @@ Rake::RDocTask.new(:rdoc) do |rdoc| rdoc.rdoc_dir = 'rdoc' rdoc.title = 'factories-and-workers' rdoc.options << '--line-numbers' << '--inline-source' - rdoc.rdoc_files.include('README') + rdoc.rdoc_files.include('README.rdoc') rdoc.rdoc_files.include('lib/**/*.rb') end Rakefile @@ -1,6 +1,6 @@ if ENV['RAILS_ENV'] == 'test' - require 'lib/factories-and-workers' + require 'factories-and-workers' require 'fileutils' %w(spec/factories.rb spec/factory_workers.rb test/factories.rb test/factory_workers.rb).each do |file| init.rb @@ -58,10 +58,28 @@ class FactoryBuilderTest < Test::Unit::TestCase end def test_valid_monkey_attributes - assert_equal( {:name => "George"}, remove_variability( valid_monkey_attributes) ) + assert_equal( {:name => "George"}, remove_variability( valid_monkey_attributes ) ) end - def test_default_monkey_attributes_alias + def test_valid_pirate_attributes_without_create + assert_difference "Monkey.count", 0 do + valid_pirate_attributes( false ) + end + end + + def test_valid_pirate_attributes_with_create + assert_difference "Monkey.count", 1 do + valid_pirate_attributes( true ) + end + end + + def test_valid_attribute__does_not_evaluate_other_attributes + assert_difference "Monkey.count", 0 do + assert_equal "Ahhrrrr, Matey!", valid_pirate_attribute(:catchphrase) + end + end + + def test_default_attributes_alias hash1 = remove_variability( valid_monkey_attributes ) hash2 = remove_variability( default_monkey_attributes ) assert_equal hash1, hash2 @@ -75,18 +93,6 @@ class FactoryBuilderTest < Test::Unit::TestCase end end - def test_valid_pirate_attributes_calling_lambda - assert_difference "Monkey.count", 1 do - assert_equal "Ahhrrrr, Matey!", valid_pirate_attributes[:catchphrase] - end - end - - def test_valid_pirate_attributes_with_single_arg_does_not_call_lambda - assert_difference "Monkey.count", 0 do - assert_equal "Ahhrrrr, Matey!", valid_pirate_attributes(:catchphrase) - end - end - def test_create_pirate_evaluates_lambda assert_difference "Pirate.count", 1 do assert_difference "Monkey.count", 1 do @@ -100,14 +106,14 @@ class FactoryBuilderTest < Test::Unit::TestCase def test_overridden_attributes @phil = create_monkey( :name => "Phil" ) - assert_not_equal valid_monkey_attributes[:name], @phil.name + assert_not_equal valid_monkey_attribute(:name), @phil.name assert_difference "Pirate.count", 0 do assert_difference "Monkey.count", 0 do @pirate = build_pirate( :monkey => @phil, :catchphrase => "chunky bacon!" ) end end - assert_not_equal valid_pirate_attributes(:catchphrase), @pirate.catchphrase + assert_not_equal valid_pirate_attribute(:catchphrase), @pirate.catchphrase assert_equal "Phil", @pirate.monkey.name assert_equal "George", build_pirate.monkey.name end @@ -115,7 +121,7 @@ class FactoryBuilderTest < Test::Unit::TestCase def test_overridden_attribute_id_will_not_evaluate_lambda_for_model_creation assert_difference "Monkey.count", 0 do @pirate = build_pirate( :monkey_id => 1 ) - end + end end protected test/factory_builder_test.rb 34795872859571892e331ab1d6368fc5f2f55325 David Lowenfels david@internautdesign.com http://github.com/dfl/factories-and-workers/commit/b8adebe65799a13c6a1ba54cae8f9948b599f97c b8adebe65799a13c6a1ba54cae8f9948b599f97c 2008-06-13T00:42:24-07:00 2008-06-13T00:42:24-07:00 adding singular valid attribute method. also pass true to make the valid_attribute method call #create for associations rather than #build 2d94ac86d6fed5e580ebcc52808dd17a556a2d59 David Lowenfels david@internautdesign.com