aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillermo Iguaran <guilleiguaran@gmail.com>2015-04-10 15:58:23 -0500
committerGuillermo Iguaran <guilleiguaran@gmail.com>2015-04-10 15:58:23 -0500
commit1d2cdaead3f6ca94fb3e8c32db6b6fc29c199714 (patch)
treeb2f06c0594fddd9386a02f9c0ff162aa081d0f3b
parentf0d3c920a5aeb3babc35500e13288e148238b65e (diff)
parent3e482f29560ae591db17e2f6332bcffd46a28d08 (diff)
downloadrails-1d2cdaead3f6ca94fb3e8c32db6b6fc29c199714.tar.gz
rails-1d2cdaead3f6ca94fb3e8c32db6b6fc29c199714.tar.bz2
rails-1d2cdaead3f6ca94fb3e8c32db6b6fc29c199714.zip
Merge pull request #19722 from sikachu/remove-ar-use_transactional_fixtures
Use `use_transactional_tests` in Active Record
-rw-r--r--activerecord/test/cases/adapters/mysql/charset_collation_test.rb2
-rw-r--r--activerecord/test/cases/adapters/mysql2/charset_collation_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql/charset_collation_test.rb b/activerecord/test/cases/adapters/mysql/charset_collation_test.rb
index 71a3756a90..c8dd49d00a 100644
--- a/activerecord/test/cases/adapters/mysql/charset_collation_test.rb
+++ b/activerecord/test/cases/adapters/mysql/charset_collation_test.rb
@@ -3,7 +3,7 @@ require 'support/schema_dumping_helper'
class CharsetCollationTest < ActiveRecord::TestCase
include SchemaDumpingHelper
- self.use_transactional_fixtures = false
+ self.use_transactional_tests = false
setup do
@connection = ActiveRecord::Base.connection
diff --git a/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb b/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb
index 71a3756a90..c8dd49d00a 100644
--- a/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb
+++ b/activerecord/test/cases/adapters/mysql2/charset_collation_test.rb
@@ -3,7 +3,7 @@ require 'support/schema_dumping_helper'
class CharsetCollationTest < ActiveRecord::TestCase
include SchemaDumpingHelper
- self.use_transactional_fixtures = false
+ self.use_transactional_tests = false
setup do
@connection = ActiveRecord::Base.connection