diff options
Diffstat (limited to 'activejob/test')
| -rw-r--r-- | activejob/test/helper.rb | 2 | ||||
| -rw-r--r-- | activejob/test/models/person.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb index 5e491332ee..a56b35da12 100644 --- a/activejob/test/helper.rb +++ b/activejob/test/helper.rb @@ -2,6 +2,8 @@ require File.expand_path('../../../load_paths', __FILE__) require 'active_job' +GlobalID.app = 'aj' + @adapter = ENV['AJADAPTER'] || 'inline' def sidekiq? diff --git a/activejob/test/models/person.rb b/activejob/test/models/person.rb index a5bdbc462b..b31396db4b 100644 --- a/activejob/test/models/person.rb +++ b/activejob/test/models/person.rb @@ -1,7 +1,5 @@ -require 'active_model/global_identification' - class Person - include ActiveModel::GlobalIdentification + include GlobalID::Identification attr_reader :id |