aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2016-02-01 10:33:56 +0900
committerAkira Matsuda <ronnie@dio.jp>2016-02-01 10:35:19 +0900
commit87e2f7e336b0576f2628cf56dc19655dc1c3eebc (patch)
tree1acabf7c89a072c609c39fc6a4a169c8b73a2d95
parent75fcb52e5736b2a595a149d8ed438814fcf1a25a (diff)
downloadrails-87e2f7e336b0576f2628cf56dc19655dc1c3eebc.tar.gz
rails-87e2f7e336b0576f2628cf56dc19655dc1c3eebc.tar.bz2
rails-87e2f7e336b0576f2628cf56dc19655dc1c3eebc.zip
:speak_no_evil: :warning:
-rw-r--r--activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb4
-rw-r--r--activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb4
2 files changed, 6 insertions, 2 deletions
diff --git a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
index f1995b243a..e8daedac53 100644
--- a/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/postgresql_adapter_test.rb
@@ -55,7 +55,9 @@ module ActiveRecord
def test_composite_primary_key
with_example_table 'id serial, number serial, PRIMARY KEY (id, number)' do
- assert_nil @connection.primary_key('ex')
+ silence_warnings do
+ assert_nil @connection.primary_key('ex')
+ end
end
end
diff --git a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
index 038d9e2d0f..4cb2f02fe2 100644
--- a/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
+++ b/activerecord/test/cases/adapters/sqlite3/sqlite3_adapter_test.rb
@@ -402,7 +402,9 @@ module ActiveRecord
def test_composite_primary_key
with_example_table 'id integer, number integer, foo integer, PRIMARY KEY (id, number)' do
- assert_nil @conn.primary_key('ex')
+ silence_warnings do
+ assert_nil @conn.primary_key('ex')
+ end
end
end