Remove smoe deprecated usages from tests

Author: enebo

test/db/postgresql/rake_test.rb

@@ -52,8 +52,8 @@ def do_teardown
   test 'rake db:structure:dump and db:structure:load' do
     omit('pg_dump not available') unless self.class.which('pg_dump')
 
-    initial_format = ActiveRecord::Base.schema_format
-    ActiveRecord::Base.schema_format = :sql
+    initial_format = ActiveRecord.schema_format
+    ActiveRecord.schema_format = :sql
     # Rake::Task["db:create"].invoke
     create_rake_test_database do |connection|
       create_schema_migrations_table(connection)
@@ -85,7 +85,7 @@ def do_teardown
     ensure
       File.delete(structure_sql) if File.exists?(structure_sql)
       Dir.rmdir 'db'
-      ActiveRecord::Base.schema_format = initial_format
+      ActiveRecord.schema_format = initial_format
     end
   end
 

test/db/postgresql/types_test.rb

@@ -375,7 +375,7 @@ def test_numrange_values
 
   def test_tsrange_values
     skip "PostgreSQL 9.2 required for range datatypes" unless supports_ranges?
-    tz = ::ActiveRecord::Base.default_timezone
+    tz = ::ActiveRecord.default_timezone
     assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)..Time.send(tz, 2011, 1, 1, 14, 30, 0), @first_range.ts_range
     assert_equal Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 1, 1, 14, 30, 0), @second_range.ts_range
     assert_equal nil, @empty_range.ts_range
@@ -424,7 +424,7 @@ def test_update_tstzrange
 
   def test_create_tsrange
     skip "PostgreSQL 9.2 required for range datatypes" unless supports_ranges?
-    tz = ::ActiveRecord::Base.default_timezone
+    tz = ::ActiveRecord.default_timezone
     tsrange = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 2, 2, 14, 30, 0)
     range = PostgresqlRange.new(:ts_range => tsrange)
     assert range.save
@@ -434,7 +434,7 @@ def test_create_tsrange
 
   def test_update_tsrange
     skip "PostgreSQL 9.2 required for range datatypes" unless supports_ranges?
-    tz = ::ActiveRecord::Base.default_timezone
+    tz = ::ActiveRecord.default_timezone
     new_tsrange = Time.send(tz, 2010, 1, 1, 14, 30, 0)...Time.send(tz, 2011, 2, 2, 14, 30, 0)
     assert @first_range.ts_range = new_tsrange
     assert @first_range.save
@@ -682,36 +682,36 @@ def test_update_oid
 
   def test_timestamp_with_zone_values_with_rails_time_zone_support
     old_tz = ActiveRecord::Base.time_zone_aware_attributes
-    old_default_tz = ActiveRecord::Base.default_timezone
+    old_default_tz = ActiveRecord.default_timezone
 
     ActiveRecord::Base.time_zone_aware_attributes = true
-    ActiveRecord::Base.default_timezone = :utc
+    ActiveRecord.default_timezone = :utc
 
     @connection.reconnect!
 
     @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
     assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
     assert_instance_of Time, @first_timestamp_with_zone.time
   ensure
-    ActiveRecord::Base.default_timezone = old_default_tz
+    ActiveRecord.default_timezone = old_default_tz
     ActiveRecord::Base.time_zone_aware_attributes = old_tz
     @connection.reconnect!
   end
 
   def test_timestamp_with_zone_values_without_rails_time_zone_support
     old_tz = ActiveRecord::Base.time_zone_aware_attributes
-    old_default_tz = ActiveRecord::Base.default_timezone
+    old_default_tz = ActiveRecord.default_timezone
 
     ActiveRecord::Base.time_zone_aware_attributes = false
-    ActiveRecord::Base.default_timezone = :local
+    ActiveRecord.default_timezone = :local
 
     @connection.reconnect!
 
     @first_timestamp_with_zone = PostgresqlTimestampWithZone.find(1)
     assert_equal Time.utc(2010,1,1, 11,0,0), @first_timestamp_with_zone.time
     assert_instance_of Time, @first_timestamp_with_zone.time
   ensure
-    ActiveRecord::Base.default_timezone = old_default_tz
+    ActiveRecord.default_timezone = old_default_tz
     ActiveRecord::Base.time_zone_aware_attributes = old_tz
     @connection.reconnect!
   end

test/db/sqlite3/simple_test.rb

@@ -260,15 +260,15 @@ def test_custom_select_datetime
     my_time = Time.utc 2013, 03, 15, 19, 53, 51, 0 # usec
     model = DbType.create! :sample_datetime => my_time
     model = DbType.where("id = #{model.id}").select('sample_datetime AS custom_sample_datetime').first
-    assert_match my_time.to_s(:db), model.custom_sample_datetime # '2013-03-15 18:53:51.000000'
+    assert_match my_time.to_fs(:db), model.custom_sample_datetime # '2013-03-15 18:53:51.000000'
   end
 
   # @override SQLite3 JDBC returns VARCHAR type for column
   def test_custom_select_date
     my_date = Time.local(2000, 01, 30, 0, 0, 0, 0).to_date
     model = DbType.create! :sample_date => my_date
     model = DbType.where("id = #{model.id}").select('sample_date AS custom_sample_date').first
-    assert_equal my_date.to_s(:db), model.custom_sample_date
+    assert_equal my_date.to_fs(:db), model.custom_sample_date
   end
 
   # @override