<?xml version="1.0" encoding="UTF-8"?>
<commit>
  <added type="array">
    <added>
      <filename>test/fixtures/widgets.yml</filename>
    </added>
    <added>
      <filename>test/models/author.rb</filename>
    </added>
    <added>
      <filename>test/models/landmark.rb</filename>
    </added>
    <added>
      <filename>test/models/page.rb</filename>
    </added>
    <added>
      <filename>test/models/widget.rb</filename>
    </added>
  </added>
  <modified type="array">
    <modified>
      <diff>@@ -1,2 +1,3 @@
+.DS_Store
 test/*.db
 test/debug.log</diff>
      <filename>.gitignore</filename>
    </modified>
    <modified>
      <diff>@@ -1,86 +1,13 @@
-require File.join(File.dirname(__FILE__),'lib/boot') unless defined?(ActiveRecord)
 require 'test/unit'
+require File.join(File.dirname(__FILE__),'lib/boot') unless defined?(ActiveRecord)
 require 'acts_as_versioned'
 
-config = YAML::load(IO.read(File.dirname(__FILE__)+'/lib/database.yml'))
-ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__)+'/debug.log')
-ActiveRecord::Base.configurations = {'test' =&gt; config[ENV['DB'] || 'sqlite3']}
-ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
-
 class AAVTestCase &lt; ActiveRecord::TestCase
   
-  self.fixture_path               = File.dirname(__FILE__)+'/fixtures'
-  self.use_instantiated_fixtures  = false
-  self.use_transactional_fixtures = true
+  fixtures :all
+  set_fixture_class :page_versions =&gt; Page::Version
   
-  setup :load_schema
   
-  protected
   
-  def load_schema
-    load(File.dirname(__FILE__)+&quot;lib/schema.rb&quot;)
-    if ENV['DB'] == 'postgresql'
-      ActiveRecord::Base.connection.execute &quot;DROP SEQUENCE widgets_seq;&quot; rescue nil
-      ActiveRecord::Base.connection.remove_column :widget_versions, :id
-      ActiveRecord::Base.connection.execute &quot;CREATE SEQUENCE widgets_seq START 101;&quot;
-      ActiveRecord::Base.connection.execute &quot;ALTER TABLE widget_versions ADD COLUMN id INTEGER PRIMARY KEY DEFAULT nextval('widgets_seq');&quot;
-    end
-  end
-  
-end
-
-
-class Landmark &lt; ActiveRecord::Base
-  acts_as_versioned :if_changed =&gt; [ :name, :longitude, :latitude ]
-end
-
-class Page &lt; ActiveRecord::Base
-  belongs_to :author
-  has_many   :authors,  :through =&gt; :versions, :order =&gt; 'name'
-  belongs_to :revisor,  :class_name =&gt; 'Author'
-  has_many   :revisors, :class_name =&gt; 'Author', :through =&gt; :versions, :order =&gt; 'name'
-  acts_as_versioned :if =&gt; :feeling_good? do
-    def self.included(base)
-      base.cattr_accessor :feeling_good
-      base.feeling_good = true
-      base.belongs_to :author
-      base.belongs_to :revisor, :class_name =&gt; 'Author'
-    end
-    def feeling_good?
-      @@feeling_good == true
-    end
-  end
-end
-
-module LockedPageExtension
-  def hello_world
-    'hello_world'
-  end
-end
-
-class LockedPage &lt; ActiveRecord::Base
-  acts_as_versioned \
-    :inheritance_column =&gt; :version_type, 
-    :foreign_key        =&gt; :page_id, 
-    :table_name         =&gt; :locked_pages_revisions, 
-    :class_name         =&gt; 'LockedPageRevision',
-    :version_column     =&gt; :lock_version,
-    :limit              =&gt; 2,
-    :if_changed         =&gt; :title,
-    :extend             =&gt; LockedPageExtension
-end
-
-class SpecialLockedPage &lt; LockedPage
-end
-
-class Author &lt; ActiveRecord::Base
-  has_many :pages
-end
-
-class Widget &lt; ActiveRecord::Base
-  acts_as_versioned :sequence_name =&gt; 'widgets_seq', :association_options =&gt; {
-    :dependent =&gt; :nullify, :order =&gt; 'version desc'
-  }
-  non_versioned_columns &lt;&lt; 'foo'
 end
 </diff>
      <filename>test/helper.rb</filename>
    </modified>
    <modified>
      <diff>@@ -1,21 +1,46 @@
+
+# Requiring ActiveRecord via RubyGems.
+
 require 'rubygems'
 
 project_root  = File.expand_path(File.join(File.dirname(__FILE__),'..','..'))
 rails_version = ENV['RAILS_VERSION'] || '2.2.2'
 
-['.','lib','test'].each do |test_lib|
-  load_path = File.expand_path(File.join(&quot;#{project_root},#{test_lib}&quot;))
+['.','lib','test','test/models'].each do |test_lib|
+  load_path = File.expand_path(File.join(project_root,test_lib))
   $LOAD_PATH.unshift(load_path) unless $LOAD_PATH.include?(load_path)
 end
 
 puts &quot;Using ActiveRecord #{rails_version} from gems&quot;
 gem 'activerecord', rails_version
-
 require 'active_record'
-require 'active_record/fixtures'
+
+
+# Setting up ActiveRecord TestCase and fixtures. We make sure our setup runs before setup_fixtures.
 
 FIXTURES_ROOT   = project_root + &quot;/test/fixtures&quot;
 MIGRATIONS_ROOT = project_root + &quot;/test/migrations&quot;
 
+require 'active_record/fixtures'
 require 'active_record/test_case'
 
+
+# Establishing the ActiveRecord connection.
+
+arconfig = YAML::load(IO.read(&quot;#{project_root}/test/lib/database.yml&quot;))
+ActiveRecord::Base.logger = Logger.new(&quot;#{project_root}/test/debug.log&quot;)
+ActiveRecord::Base.configurations = {'test' =&gt; arconfig[ENV['DB'] || 'sqlite3']}
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
+
+
+# Creating the DB schema.
+
+load(File.dirname(__FILE__)+&quot;/schema.rb&quot;)
+
+if ENV['DB'] == 'postgresql'
+  ActiveRecord::Base.connection.execute &quot;DROP SEQUENCE widgets_seq;&quot; rescue nil
+  ActiveRecord::Base.connection.remove_column :widget_versions, :id
+  ActiveRecord::Base.connection.execute &quot;CREATE SEQUENCE widgets_seq START 101;&quot;
+  ActiveRecord::Base.connection.execute &quot;ALTER TABLE widget_versions ADD COLUMN id INTEGER PRIMARY KEY DEFAULT nextval('widgets_seq');&quot;
+end
+</diff>
      <filename>test/lib/boot.rb</filename>
    </modified>
    <modified>
      <diff>@@ -2,10 +2,6 @@ require 'helper'
 
 class VersionedTest &lt; AAVTestCase
   
-  fixtures :pages, :page_versions, :locked_pages, :locked_pages_revisions, :authors, :landmarks, :landmark_versions
-  set_fixture_class :page_versions =&gt; Page::Version
-  
-  setup :load_schema
   
   def test_saves_versioned_copy
     p = Page.create! :title =&gt; 'first title', :body =&gt; 'first body'</diff>
      <filename>test/versioned_test.rb</filename>
    </modified>
  </modified>
  <removed type="array"/>
  <parents type="array">
    <parent>
      <id>e137748b4a7248556f7d737da3d00b3827d71ded</id>
    </parent>
  </parents>
  <author>
    <name>Ken Collins</name>
    <email>ken@metaskills.net</email>
  </author>
  <url>http://github.com/metaskills/acts_as_versioned/commit/2991e56482c63799bdd75efc0e67b87cd9b91986</url>
  <id>2991e56482c63799bdd75efc0e67b87cd9b91986</id>
  <committed-date>2008-12-26T13:30:54-08:00</committed-date>
  <authored-date>2008-12-26T13:30:54-08:00</authored-date>
  <message>Finally got tests running with the dir structure I want.</message>
  <tree>4fa4a72f3efa9a1ce157bc44e0ac50b6b915ee66</tree>
  <committer>
    <name>Ken Collins</name>
    <email>ken@metaskills.net</email>
  </committer>
</commit>
