diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb index c959479d..494ab5d2 100644 --- a/lib/sidekiq.rb +++ b/lib/sidekiq.rb @@ -16,7 +16,7 @@ module Sidekiq :require => '.', :environment => nil, :timeout => 5, - :hook_rails => true, + :enable_rails_extensions => true, } def self.options diff --git a/lib/sidekiq/rails.rb b/lib/sidekiq/rails.rb index 1d272260..cf4e07c8 100644 --- a/lib/sidekiq/rails.rb +++ b/lib/sidekiq/rails.rb @@ -1,6 +1,6 @@ module Sidekiq def self.hook_rails! - return unless Sidekiq.options[:hook_rails] + return unless Sidekiq.options[:enable_rails_extensions] if defined?(ActiveRecord) ActiveRecord::Base.extend(Sidekiq::Extensions::ActiveRecord) ActiveRecord::Base.send(:include, Sidekiq::Extensions::ActiveRecord) diff --git a/test/test_extension_configuration.rb b/test/test_extension_configuration.rb index 4e7929dc..eff6cef1 100644 --- a/test/test_extension_configuration.rb +++ b/test/test_extension_configuration.rb @@ -11,16 +11,16 @@ class TestExtensionConfiguration < MiniTest::Unit::TestCase Sidekiq.options = @options end - it 'should set hook_rails option to true by default' do - assert_equal true, Sidekiq.options[:hook_rails] + it 'should set enable_rails_extensions option to true by default' do + assert_equal true, Sidekiq.options[:enable_rails_extensions] end - it 'should extend ActiveRecord and ActiveMailer if hook_rails is true' do + it 'should extend ActiveRecord and ActiveMailer if enable_rails_extensions is true' do assert_equal ActionMailer::Base, Sidekiq.hook_rails! end - it 'should not extend ActiveRecord and ActiveMailer if hook_rails is false' do - Sidekiq.options = { :hook_rails => false } + it 'should not extend ActiveRecord and ActiveMailer if enable_rails_extensions is false' do + Sidekiq.options = { :enable_rails_extensions => false } assert_equal nil, Sidekiq.hook_rails! end