diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-21 17:20:51 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-21 17:20:51 +0000 |
| commit | 39814fcce0b429eb06654600e4669f1405ffa7d9 (patch) | |
| tree | bc5cbe7888b3c31b1e2a92f246512218014fdf76 /activerecord/test/cases/locking_test.rb | |
| parent | 1d4f4cdfe22cbe4962ae8953c96bc5c70d8d4e6a (diff) | |
| download | rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.gz rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.bz2 rails-39814fcce0b429eb06654600e4669f1405ffa7d9.zip | |
Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/cases/locking_test.rb')
| -rw-r--r-- | activerecord/test/cases/locking_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/locking_test.rb b/activerecord/test/cases/locking_test.rb index eb82b13e19..e80f902d0d 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -1,4 +1,4 @@ -require 'abstract_unit' +require "cases/helper" require 'models/person' require 'models/reader' require 'models/legacy_thing' @@ -14,7 +14,7 @@ class ReadonlyFirstNamePerson < Person attr_readonly :first_name end -class OptimisticLockingTest < ActiveSupport::TestCase +class OptimisticLockingTest < ActiveRecord::TestCase fixtures :people, :legacy_things # need to disable transactional fixtures, because otherwise the sqlite3 @@ -176,7 +176,7 @@ end # TODO: The SQL Server, Sybase, and OpenBase adapters currently have no support for pessimistic locking unless current_adapter?(:SQLServerAdapter, :SybaseAdapter, :OpenBaseAdapter) - class PessimisticLockingTest < ActiveSupport::TestCase + class PessimisticLockingTest < ActiveRecord::TestCase self.use_transactional_fixtures = false fixtures :people, :readers |