rework abstract_unit so tests pass

git-svn-id: http://svn.techno-weenie.net/projects/plugins/acts_as_versioned@2946 567b1171-46fb-0310-a4c9-b4bef9110e78

2 files changed, 19 insertions, 25 deletions

diff --git a/test/abstract_unit.rb b/test/abstract_unit.rb
index 1740db8dc..177302e58 100644
--- a/test/abstract_unit.rb
+++ b/test/abstract_unit.rb
@@ -1,12 +1,16 @@
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activesupport/lib')
+$:.unshift(File.dirname(__FILE__) + '/../../../rails/activerecord/lib')
 $:.unshift(File.dirname(__FILE__) + '/../lib')
-
 require 'test/unit'
-require File.expand_path(File.join(File.dirname(__FILE__), '../../../../config/environment.rb'))
+require 'active_support'
+require 'active_record'
 require 'active_record/fixtures'
+require 'acts_as_versioned'
 
 config = YAML::load(IO.read(File.dirname(__FILE__) + '/database.yml'))
 ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/debug.log")
-ActiveRecord::Base.establish_connection(config[ENV['DB'] || 'sqlite'])
+ActiveRecord::Base.configurations = {'test' => config[ENV['DB'] || 'sqlite']}
+ActiveRecord::Base.establish_connection(ActiveRecord::Base.configurations['test'])
 
 load(File.dirname(__FILE__) + "/schema.rb")
 
@@ -19,17 +23,9 @@ if ENV['DB'] == 'postgresql'
 end
 
 Test::Unit::TestCase.fixture_path = File.dirname(__FILE__) + "/fixtures/"
-$LOAD_PATH.unshift(Test::Unit::TestCase.fixture_path)
+$:.unshift(Test::Unit::TestCase.fixture_path)
 
 class Test::Unit::TestCase #:nodoc:
-  def create_fixtures(*table_names)
-    if block_given?
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names) { yield }
-    else
-      Fixtures.create_fixtures(Test::Unit::TestCase.fixture_path, table_names)
-    end
-  end
-
   # Turn off transactional fixtures if you're working with MyISAM tables in MySQL
   self.use_transactional_fixtures = true
   
diff --git a/test/versioned_test.rb b/test/versioned_test.rb
index c1e1a4b98..b1109eb0c 100644
--- a/test/versioned_test.rb
+++ b/test/versioned_test.rb
@@ -6,7 +6,7 @@ class VersionedTest < Test::Unit::TestCase
   fixtures :pages, :page_versions, :locked_pages, :locked_pages_revisions, :authors, :landmarks, :landmark_versions
 
   def test_saves_versioned_copy
-    p = Page.create :title => 'first title', :body => 'first body'
+    p = Page.create! :title => 'first title', :body => 'first body'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_equal 1, p.version
@@ -69,7 +69,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_saves_versioned_copy_with_options
-    p = LockedPage.create :title => 'first title'
+    p = LockedPage.create! :title => 'first title'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_instance_of LockedPage.versioned_class, p.versions.first
@@ -96,7 +96,7 @@ class VersionedTest < Test::Unit::TestCase
   end
   
   def test_saves_versioned_copy_with_sti
-    p = SpecialLockedPage.create :title => 'first title'
+    p = SpecialLockedPage.create! :title => 'first title'
     assert !p.new_record?
     assert_equal 1, p.versions.size
     assert_instance_of LockedPage.versioned_class, p.versions.first
@@ -127,7 +127,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_if_condition
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version
     
     Page.feeling_good = false
@@ -144,7 +144,7 @@ class VersionedTest < Test::Unit::TestCase
       alias_method :feeling_good?, :new_feeling_good
     end
     
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
     
@@ -165,7 +165,7 @@ class VersionedTest < Test::Unit::TestCase
     old_condition = Page.version_condition
     Page.version_condition = Proc.new { |page| page.title[0..0] == 'b' }
     
-    p = Page.create :title => "title"
+    p = Page.create! :title => "title"
     assert_equal 1, p.version # version does not increment
     assert_equal 1, p.versions(true).size
     
@@ -182,7 +182,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_no_limit
-    p = Page.create :title => "title", :body => 'first body'
+    p = Page.create! :title => "title", :body => 'first body'
     p.save
     p.save
     5.times do |i|
@@ -191,7 +191,7 @@ class VersionedTest < Test::Unit::TestCase
   end
 
   def test_version_max_limit
-    p = LockedPage.create :title => "title"
+    p = LockedPage.create! :title => "title"
     p.update_attributes(:title => "title1")
     p.update_attributes(:title => "title2")
     5.times do |i|
@@ -214,7 +214,7 @@ class VersionedTest < Test::Unit::TestCase
   end
   
   def test_track_changed_attributes    
-    p = LockedPage.create :title => "title"
+    p = LockedPage.create! :title => "title"
     assert_equal 1, p.lock_version
     assert_equal 1, p.versions(true).size
     
@@ -254,9 +254,7 @@ class VersionedTest < Test::Unit::TestCase
   
   def test_with_sequence
     assert_equal 'widgets_seq', Widget.versioned_class.sequence_name
-    Widget.create :name => 'new widget'
-    Widget.create :name => 'new widget'
-    Widget.create :name => 'new widget'
+    3.times { Widget.create! :name => 'new widget' }
     assert_equal 3, Widget.count
     assert_equal 3, Widget.versioned_class.count
   end
@@ -287,7 +285,7 @@ class VersionedTest < Test::Unit::TestCase
     assert_equal 'version desc', options[:order]
     assert_equal 'widget_id', options[:foreign_key]
     
-    widget = Widget.create :name => 'new widget'
+    widget = Widget.create! :name => 'new widget'
     assert_equal 1, Widget.count
     assert_equal 1, Widget.versioned_class.count
     widget.destroy