Merge pull request #241 from doorkeeper-gem/copilot/fix-doorkeeper-gemfile-tests

Fix NameError on doorkeeper master by deferring AR model loading in run_hooks

Author: nbulaj

CHANGELOG.md

@@ -1,6 +1,7 @@
 ## Unreleased
 
 - Please add here
+- [#241] Fix NameError on doorkeeper master by deferring AR model loading in run_hooks
 
 ## v1.9.0 (2026-03-16)
 

lib/doorkeeper/openid_connect/orm/active_record.rb

@@ -16,15 +16,17 @@ module Mixins
         def run_hooks
           super
 
-          if Gem.loaded_specs['doorkeeper'].version >= Gem::Version.create('5.5.0')
-            Doorkeeper.config.access_grant_model.prepend Doorkeeper::OpenidConnect::AccessGrant
-          else
-            Doorkeeper::AccessGrant.prepend Doorkeeper::OpenidConnect::AccessGrant
-          end
+          ActiveSupport.on_load(:active_record) do
+            if Gem.loaded_specs['doorkeeper'].version >= Gem::Version.create('5.5.0')
+              Doorkeeper.config.access_grant_model.prepend Doorkeeper::OpenidConnect::AccessGrant
+            else
+              Doorkeeper::AccessGrant.prepend Doorkeeper::OpenidConnect::AccessGrant
+            end
 
-          if Doorkeeper.configuration.respond_to?(:active_record_options) && Doorkeeper.configuration.active_record_options[:establish_connection]
-            [Doorkeeper::OpenidConnect.configuration.open_id_request_model].each do |c|
-              c.send :establish_connection, Doorkeeper.configuration.active_record_options[:establish_connection]
+            if Doorkeeper.configuration.respond_to?(:active_record_options) && Doorkeeper.configuration.active_record_options[:establish_connection]
+              [Doorkeeper::OpenidConnect.configuration.open_id_request_model].each do |c|
+                c.send :establish_connection, Doorkeeper.configuration.active_record_options[:establish_connection]
+              end
             end
           end
         end

spec/models/access_grant_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Doorkeeper::OpenidConnect::AccessGrant do
-  subject { Doorkeeper::AccessGrant.new }
+  subject { Doorkeeper.config.access_grant_model.new }
   let(:openid_request_class_name) { Doorkeeper::OpenidConnect.configuration.open_id_request_class }
   let(:openid_request_class) { Doorkeeper::OpenidConnect.configuration.open_id_request_model }