Merge pull request #129 from cupnoodle/cupnoodle-patch-1

Fix spec environment and deprecation warning seen with ActiveRecord v 7.1

lib/sinatra/activerecord.rb

@@ -59,8 +59,18 @@ def self.registered(app)
       app.helpers ActiveRecordHelper
 
       # re-connect if database connection dropped (Rails 3 only)
-      app.before { ActiveRecord::Base.verify_active_connections! if ActiveRecord::Base.respond_to?(:verify_active_connections!) }
-      app.after { ActiveRecord::Base.clear_active_connections! }
+      app.before do
+        if ActiveRecord::VERSION::MAJOR == 3
+          ActiveRecord::Base.verify_active_connections! if ActiveRecord::Base.respond_to?(:verify_active_connections!)
+        end
+      end
+      app.after do
+        if ActiveRecord::VERSION::MAJOR < 7
+          ActiveRecord::Base.clear_active_connections!
+        else
+          ActiveRecord::Base.connection_handler.clear_active_connections!
+        end
+      end
     end
 
     def database_file=(path)

spec/sinatra/activerecord/rake_spec.rb

@@ -40,6 +40,8 @@ def invoke(*args)
 
   it "has all the rake tasks working" do
     begin
+      # by default we configure a development database
+      ENV['RAILS_ENV'] = 'development'
       ENV["NAME"] = "create_users"
 
       Rake::Task["db:create"].invoke