diff --git a/gemfiles/activerecord70.gemfile b/gemfiles/activerecord70.gemfile new file mode 100644 index 0000000..c494eec --- /dev/null +++ b/gemfiles/activerecord70.gemfile @@ -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" diff --git a/test/support/activerecord.rb b/test/support/activerecord.rb index 12ce9ec..6fb2cc6 100644 --- a/test/support/activerecord.rb +++ b/test/support/activerecord.rb @@ -4,7 +4,11 @@ require "active_record" 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 -- libgit2 0.21.0