Merge pull request #647 from mislav/fix-ci

Fix CI

environments/Gemfile.rails5.0.rb

@@ -13,3 +13,6 @@
 
 gem 'mysql2', '~> 0.5.2', :group => :mysql
 gem 'pg', '~> 1.2.3', :group => :pg
+
+# ruby 2.4 compat re: nokogiri
+gem 'loofah', '< 2.21.0'

environments/Gemfile.rails5.1.rb

@@ -12,3 +12,6 @@
 
 gem 'mysql2', '~> 0.5.2', :group => :mysql
 gem 'pg', '~> 1.2.3', :group => :pg
+
+# ruby 2.4 compat re: nokogiri
+gem 'loofah', '< 2.21.0'

environments/Gemfile.rails5.2.rb

@@ -11,3 +11,6 @@
 gem 'sqlite3', '~> 1.3.6'
 gem 'mysql2', '~> 0.5.2', :group => :mysql
 gem 'pg', '~> 1.2.3', :group => :pg
+
+# ruby 2.4 compat re: nokogiri
+gem 'loofah', '< 2.21.0'

spec/finders/activerecord_test_connector.rb

@@ -6,6 +6,11 @@
 require 'date'
 require 'yaml'
 
+# forward compatibility with Rails 7 (needed for time expressions within fixtures)
+class Time
+  alias_method :to_fs, :to_s
+end unless Time.new.respond_to?(:to_fs)
+
 # monkeypatch needed for Ruby 3.1 & Rails 6.0
 YAML.module_eval do
   class << self

spec/fixtures/replies.yml

@@ -2,28 +2,28 @@ witty_retort:
   id: 1
   topic_id: 1
   content: Birdman is better!
-  created_at: <%= 6.hours.ago.utc.to_s(:db) %>
+  created_at: <%= 6.hours.ago.utc.to_fs(:db) %>
 
 another:
   id: 2
   topic_id: 2
   content: Nuh uh!
-  created_at: <%= 1.hour.ago.utc.to_s(:db) %>
+  created_at: <%= 1.hour.ago.utc.to_fs(:db) %>
 
 spam:
   id: 3
   topic_id: 1
   content: Nice site!
-  created_at: <%= 1.hour.ago.utc.to_s(:db) %>
+  created_at: <%= 1.hour.ago.utc.to_fs(:db) %>
 
 decisive:
   id: 4
   topic_id: 4
   content: "I'm getting to the bottom of this"
-  created_at: <%= 30.minutes.ago.utc.to_s(:db) %>
+  created_at: <%= 30.minutes.ago.utc.to_fs(:db) %>
 
 brave:
   id: 5
   topic_id: 4
   content: "AR doesn't scare me a bit"
-  created_at: <%= 10.minutes.ago.utc.to_s(:db) %>
+  created_at: <%= 10.minutes.ago.utc.to_fs(:db) %>

spec/fixtures/topics.yml

@@ -3,15 +3,15 @@ futurama:
   title: Isnt futurama awesome?
   subtitle: It really is, isnt it.
   content: I like futurama
-  created_at: <%= 1.day.ago.utc.to_s(:db) %>
+  created_at: <%= 1.day.ago.utc.to_fs(:db) %>
   updated_at:
 
 harvey_birdman:
   id: 2
   title: Harvey Birdman is the king of all men
   subtitle: yup
   content: He really is
-  created_at: <%= 2.hours.ago.utc.to_s(:db) %>
+  created_at: <%= 2.hours.ago.utc.to_fs(:db) %>
   updated_at:
 
 rails:
@@ -20,11 +20,11 @@ rails:
   title: Rails is nice
   subtitle: It makes me happy
   content: except when I have to hack internals to fix pagination. even then really.
-  created_at: <%= 20.minutes.ago.utc.to_s(:db) %>
+  created_at: <%= 20.minutes.ago.utc.to_fs(:db) %>
 
 ar:
   id: 4
   project_id: 1
   title: ActiveRecord sometimes freaks me out
   content: "I mean, what's the deal with eager loading?"
-  created_at: <%= 15.minutes.ago.utc.to_s(:db) %>
+  created_at: <%= 15.minutes.ago.utc.to_fs(:db) %>

spec/spec_helper.rb

@@ -14,7 +14,11 @@ def have_deprecation(msg)
     end
 
     def ignore_deprecation
-      ActiveSupport::Deprecation.silence { yield }
+      if ActiveSupport::Deprecation.respond_to?(:silence)
+        ActiveSupport::Deprecation.silence { yield }
+      else
+        yield
+      end
     end
   }