diff options
| author | Abdelkader Boudih <terminale@gmail.com> | 2014-08-17 01:06:30 +0000 |
|---|---|---|
| committer | Abdelkader Boudih <terminale@gmail.com> | 2014-08-17 23:10:45 +0000 |
| commit | 2f7b239fca6630e49ba8ad9df6fc7db25e1080f0 (patch) | |
| tree | 3de16393c2c3ff4fcf1534c28e700b937a3c05b6 /activejob/test | |
| parent | 59221cc4f1b8f87553455aad26905c4f28b424f8 (diff) | |
| download | rails-2f7b239fca6630e49ba8ad9df6fc7db25e1080f0.tar.gz rails-2f7b239fca6630e49ba8ad9df6fc7db25e1080f0.tar.bz2 rails-2f7b239fca6630e49ba8ad9df6fc7db25e1080f0.zip | |
[ActiveJob] Use globalid gem
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 |