Fixed warning in tests with Active Record 7 [skip ci]

Andrew Kane
1 parent ef30d536
Showing 2 changed files with 21 additions and 1 deletions Show diff stats
gemfiles/activerecord70.gemfile
test/support/activerecord.rb
@@ -0,0 +1,16 @@
+source "https://rubygems.org"
+
+gemspec path: ".."
+
+gem "rake"
+gem "minitest", ">= 5"
+gem "sqlite3"
+gem "activerecord", "~> 7.0.0.alpha2"
+gem "actionpack", "~> 7.0.0.alpha2"
+gem "activejob", "~> 7.0.0.alpha2", require: "active_job"
+gem "elasticsearch", "~> 7"
+gem "elasticsearch-xpack", ">= 7.8", "< 7.14"
+gem "redis"
+gem "connection_pool"
+gem "kaminari"
+gem "gemoji-parser"
@@ -4,7 +4,11 @@ require &quot;active_record&quot;
 ActiveRecord::Base.logger = $logger
  
 # rails does this in activerecord/lib/active_record/railtie.rb
-ActiveRecord::Base.default_timezone = :utc
+if ActiveRecord::VERSION::MAJOR >= 7
+  ActiveRecord.default_timezone = :utc
+else
+  ActiveRecord::Base.default_timezone = :utc
+end
 ActiveRecord::Base.time_zone_aware_attributes = true
  
 # migrations
...	...	@@ -0,0 +1,16 @@
	1	+source "https://rubygems.org"
	2	+
	3	+gemspec path: ".."
	4	+
	5	+gem "rake"
	6	+gem "minitest", ">= 5"
	7	+gem "sqlite3"
	8	+gem "activerecord", "~> 7.0.0.alpha2"
	9	+gem "actionpack", "~> 7.0.0.alpha2"
	10	+gem "activejob", "~> 7.0.0.alpha2", require: "active_job"
	11	+gem "elasticsearch", "~> 7"
	12	+gem "elasticsearch-xpack", ">= 7.8", "< 7.14"
	13	+gem "redis"
	14	+gem "connection_pool"
	15	+gem "kaminari"
	16	+gem "gemoji-parser"
...	...
...	...	@@ -4,7 +4,11 @@ require "active_record"
4	4	ActiveRecord::Base.logger = $logger
5	5
6	6	# rails does this in activerecord/lib/active_record/railtie.rb
7		-ActiveRecord::Base.default_timezone = :utc
	7	+if ActiveRecord::VERSION::MAJOR >= 7
	8	+ ActiveRecord.default_timezone = :utc
	9	+else
	10	+ ActiveRecord::Base.default_timezone = :utc
	11	+end
8	12	ActiveRecord::Base.time_zone_aware_attributes = true
9	13
10	14	# migrations
...	...