diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-16 19:07:53 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-03-16 19:07:53 -0300 |
commit | eaf38575bb29680071233f03e53813ba1404e145 (patch) | |
tree | 722150398959ff94147027a17aedd83d8a2fa2f6 /activerecord/test/cases/locking_test.rb | |
parent | 82c2baf5348c7f1fa54f410282c11ba1cee2f377 (diff) | |
parent | 096586356426d72c300c8fa854d66703d5481378 (diff) | |
download | rails-eaf38575bb29680071233f03e53813ba1404e145.tar.gz rails-eaf38575bb29680071233f03e53813ba1404e145.tar.bz2 rails-eaf38575bb29680071233f03e53813ba1404e145.zip |
Merge pull request #19282 from brandonweiss/better-name-for-transactional-fixtures
Renaming transactional fixtures to transactional tests
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 848174df06..9e4998a946 100644 --- a/activerecord/test/cases/locking_test.rb +++ b/activerecord/test/cases/locking_test.rb @@ -285,10 +285,10 @@ end class OptimisticLockingWithSchemaChangeTest < ActiveRecord::TestCase fixtures :people, :legacy_things, :references - # need to disable transactional fixtures, because otherwise the sqlite3 + # need to disable transactional tests, because otherwise the sqlite3 # adapter (at least) chokes when we try and change the schema in the middle # of a test (see test_increment_counter_*). - self.use_transactional_fixtures = false + self.use_transactional_tests = false { :lock_version => Person, :custom_lock_version => LegacyThing }.each do |name, model| define_method("test_increment_counter_updates_#{name}") do @@ -365,7 +365,7 @@ end # (See exec vs. async_exec in the PostgreSQL adapter.) unless in_memory_db? class PessimisticLockingTest < ActiveRecord::TestCase - self.use_transactional_fixtures = false + self.use_transactional_tests = false fixtures :people, :readers def setup |