@@ -45,9 +45,12 @@ module Machinery self.instance_variables.each do |ivar| obj = self.instance_variable_get(ivar) next unless obj.is_a?(::ActiveRecord::Base) - clone = obj.clone - clone.id = obj.id - clone.instance_variable_set('@new_record', obj.new_record?) + + clone = obj.class.new + clone.instance_variable_set("@attributes", obj.instance_variable_get(:@attributes).dup) + clone.instance_variable_set("@new_record", obj.new_record?) + clone.instance_variable_set("@changed_attributes", nil) + self.instance_variable_set(ivar, clone) end end lib/machinery.rb @@ -1,10 +1,10 @@ Gem::Specification.new do |s| s.name = "machinery" - s.version = "0.9.1" + s.version = "0.9.3" s.author = "Lawrence Pit" s.email = "lawrence.pit@gmail.com" s.homepage = "http://github.com/lawrencepit/machinery" - s.summary = "Machinery to create object graphs and speed up tests." + s.summary = "Machinery to create object graphs and speed up tests. No fixtures, no funny magic, just easy and fast plain old ruby." s.files = ["README.markdown", "MIT-LICENSE", "lib/machinery.rb", "lib/machinery/active_record.rb"] s.require_path = "lib" s.has_rdoc = false machinery.gemspec @@ -10,30 +10,28 @@ describe Machinery, "with earth ships only" do @titanic.should_not be_nil end - it "should be a ship" do + it "should be a @titanic ship" do @titanic.should be_instance_of(Ship) end - it "should not create @apollo" do - @apollo.should be_nil + it "should have the name Titanic" do + @titanic.name.should == "Titanic" end -end -describe Machinery, "with space ships only" do - before(:each) do - scenario :space_ships + it "should not create @apollo" do + @apollo.should be_nil end - - it "should create @apollo" do - @apollo.should_not be_nil + + it "should not have any changed attributes for @titanic" do + @titanic.changed?.should be_false end - it "should be a ship" do - @apollo.should be_instance_of(Ship) + it "should not be a new @titanic" do + @titanic.new_record?.should be_false end - - it "should not create @titanic" do - @titanic.should be_nil + + it "should be a new @voc" do + @voc.new_record?.should be_true end end @@ -185,7 +183,7 @@ describe Machinery, "clone instances before each test" do it "should delete Titanic" do #simulating spec/rails transactional fixtures: rollback after each example Ship.transaction do - @titanic.destroy + @titanic.destroy # this freezes @titanic Ship.find_by_name('Titanic').should be_nil raise ActiveRecord::Rollback end @@ -196,6 +194,7 @@ describe Machinery, "clone instances before each test" do end it "should not be frozen" do + @titanic.frozen?.should be_false lambda { @titanic.name = "Updated Titanic" }.should_not raise_error end spec/machinery_spec.rb @@ -23,28 +23,6 @@ class MachineryWithEarthShipsOnlyTest < Test::Unit::TestCase end end -class MachineryWithSpaceShipsOnlyTest < Test::Unit::TestCase - def setup - scenario :space_ships - end - - def teardown - rollback_scenarios - end - - def test_should_create_apollo - assert(!@apollo.nil?) - end - - def test_should_be_a_ship - assert(@apollo.is_a?(Ship)) - end - - def test_should_not_create_titanic - assert(@titanic.nil?) - end -end - class MachineryWithAllShipsTest < Test::Unit::TestCase def setup scenario :all_ships spec/machinery_test.rb @@ -1,6 +1,7 @@ scenario :earth_ships do @titanic = Ship.create!(:name => "Titanic") @pirates = Ship.create!(:name => "Pirate") + @voc = Ship.new(:name => "VOC") end scenario :space_ships do spec/scenarios.rb 5beaa0d9dc6512baf4da4bde979aac27df1d3867 Lawrence Pit lawrence.pit@gmail.com http://github.com/lawrencepit/machinery/commit/5bd7d1314ee2ace1e9bf22339bc225cfbd616e24 5bd7d1314ee2ace1e9bf22339bc225cfbd616e24 2009-11-02T02:29:02-08:00 2009-11-02T02:29:02-08:00 Improved cloning AR objects. 3ae96aa67e32586133331ae3f5249d72f390cae2 Lawrence Pit lawrence.pit@gmail.com