diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-08-13 14:42:51 +0200 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-08-13 14:42:51 +0200 |
| commit | 80cee184acfa9cc831a20aca7be13d3bc8dcf845 (patch) | |
| tree | 946bc8c2b9a00ec9dc0a887af0f8202b18e03d34 /activerecord/test/cases | |
| parent | bf0a67931dd8e58f6f878b9510ae818ae1f29a3a (diff) | |
| parent | 12ce5b1cf6be926d6ca22474d1d77ca83b9da2bf (diff) | |
| download | rails-80cee184acfa9cc831a20aca7be13d3bc8dcf845.tar.gz rails-80cee184acfa9cc831a20aca7be13d3bc8dcf845.tar.bz2 rails-80cee184acfa9cc831a20aca7be13d3bc8dcf845.zip | |
Merge pull request #16491 from akshay-vishnoi/doc-changes
[ci skip] fix spelling of overridden
Diffstat (limited to 'activerecord/test/cases')
| -rw-r--r-- | activerecord/test/cases/adapters/mysql/connection_test.rb | 2 | ||||
| -rw-r--r-- | activerecord/test/cases/adapters/mysql2/connection_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/mysql/connection_test.rb b/activerecord/test/cases/adapters/mysql/connection_test.rb index b0759dffde..a7b0addc1b 100644 --- a/activerecord/test/cases/adapters/mysql/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql/connection_test.rb @@ -150,7 +150,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase end end - def test_mysql_sql_mode_variable_overides_strict_mode + def test_mysql_sql_mode_variable_overrides_strict_mode run_without_connection do |orig_connection| ActiveRecord::Base.establish_connection(orig_connection.deep_merge(variables: { 'sql_mode' => 'ansi' })) result = ActiveRecord::Base.connection.exec_query 'SELECT @@SESSION.sql_mode' diff --git a/activerecord/test/cases/adapters/mysql2/connection_test.rb b/activerecord/test/cases/adapters/mysql2/connection_test.rb index 3b35e69e0d..beedb4f3a1 100644 --- a/activerecord/test/cases/adapters/mysql2/connection_test.rb +++ b/activerecord/test/cases/adapters/mysql2/connection_test.rb @@ -76,7 +76,7 @@ class MysqlConnectionTest < ActiveRecord::TestCase end end - def test_mysql_sql_mode_variable_overides_strict_mode + def test_mysql_sql_mode_variable_overrides_strict_mode run_without_connection do |orig_connection| ActiveRecord::Base.establish_connection(orig_connection.deep_merge(variables: { 'sql_mode' => 'ansi' })) result = ActiveRecord::Base.connection.exec_query 'SELECT @@SESSION.sql_mode' |