diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-08-17 09:05:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-17 09:05:44 +0200 |
| commit | 8d7c00523cedbe643f5b9090276adb5f9c2020cc (patch) | |
| tree | 3a66f721c922e09759b903debdcd67d9eec9fabb | |
| parent | 9d59193e40bfd8bded4a129d3288c0cecc21a38a (diff) | |
| parent | 0868cac0ef400a2eb83398e03a468a61924109cb (diff) | |
| download | rails-8d7c00523cedbe643f5b9090276adb5f9c2020cc.tar.gz rails-8d7c00523cedbe643f5b9090276adb5f9c2020cc.tar.bz2 rails-8d7c00523cedbe643f5b9090276adb5f9c2020cc.zip | |
Merge pull request #30287 from y-yagi/use_queue_adapter_name_to_get_adapter_name
Use `ActiveJob::Base.queue_adapter_name` to get adapter name
| -rw-r--r-- | activejob/test/support/integration/test_case_helpers.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb index 9629876a6d..f02a32a38e 100644 --- a/activejob/test/support/integration/test_case_helpers.rb +++ b/activejob/test/support/integration/test_case_helpers.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/string/inflections" require "support/integration/jobs_manager" module TestCaseHelpers @@ -30,8 +29,7 @@ module TestCaseHelpers end def adapter_is?(*adapter_class_symbols) - adapter = ActiveJob::Base.queue_adapter.class.name.demodulize.chomp("Adapter").underscore - adapter_class_symbols.map(&:to_s).include? adapter + adapter_class_symbols.map(&:to_s).include? ActiveJob::Base.queue_adapter_name end def wait_for_jobs_to_finish_for(seconds = 60) |