aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYasuo Honda <yasuo.honda@gmail.com>2013-04-01 23:42:57 +0900
committerkennyj <kennyj@gmail.com>2013-04-03 01:14:07 +0900
commit67994ef2f9d6c529ec88c28c884681eafa335309 (patch)
tree6472f2ee615990107a9caac3ea7460e8229253c8
parent0074d7d28bc75759a8835b25ab455dd597b46a9b (diff)
downloadrails-67994ef2f9d6c529ec88c28c884681eafa335309.tar.gz
rails-67994ef2f9d6c529ec88c28c884681eafa335309.tar.bz2
rails-67994ef2f9d6c529ec88c28c884681eafa335309.zip
Show deprecated messages only when target database adapters defined
-rw-r--r--activerecord/test/cases/tasks/firebird_rake_test.rb2
-rw-r--r--activerecord/test/cases/tasks/oracle_rake_test.rb2
-rw-r--r--activerecord/test/cases/tasks/sqlserver_rake_test.rb2
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