From 67994ef2f9d6c529ec88c28c884681eafa335309 Mon Sep 17 00:00:00 2001 From: Yasuo Honda Date: Mon, 1 Apr 2013 23:42:57 +0900 Subject: Show deprecated messages only when target database adapters defined --- activerecord/test/cases/tasks/firebird_rake_test.rb | 2 +- activerecord/test/cases/tasks/oracle_rake_test.rb | 2 +- activerecord/test/cases/tasks/sqlserver_rake_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/activerecord/test/cases/tasks/firebird_rake_test.rb b/activerecord/test/cases/tasks/firebird_rake_test.rb index 37b734605b..c54989ae34 100644 --- a/activerecord/test/cases/tasks/firebird_rake_test.rb +++ b/activerecord/test/cases/tasks/firebird_rake_test.rb @@ -23,7 +23,7 @@ module ActiveRecord ActiveSupport::Deprecation.silence { super } end end - ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) + ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) unless defined? ActiveRecord::ConnectionAdapters::FirebirdAdapter end end diff --git a/activerecord/test/cases/tasks/oracle_rake_test.rb b/activerecord/test/cases/tasks/oracle_rake_test.rb index 3d8e99b1f5..5f840febbc 100644 --- a/activerecord/test/cases/tasks/oracle_rake_test.rb +++ b/activerecord/test/cases/tasks/oracle_rake_test.rb @@ -17,7 +17,7 @@ module ActiveRecord ActiveSupport::Deprecation.silence { super } end end - ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) + ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) unless defined? ActiveRecord::ConnectionAdapters::OracleAdapter end end diff --git a/activerecord/test/cases/tasks/sqlserver_rake_test.rb b/activerecord/test/cases/tasks/sqlserver_rake_test.rb index b66980f622..0f1264b8ce 100644 --- a/activerecord/test/cases/tasks/sqlserver_rake_test.rb +++ b/activerecord/test/cases/tasks/sqlserver_rake_test.rb @@ -20,7 +20,7 @@ module ActiveRecord ActiveSupport::Deprecation.silence { super } end end - ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) + ActiveRecord::Tasks::DatabaseTasks.stubs(:class_for_adapter).returns(@tasks) unless defined? ActiveRecord::ConnectionAdapters::SQLServerAdapter end end -- cgit v1.2.3