aboutsummaryrefslogtreecommitdiffstats
path: root/activejob
diff options
context:
space:
mode:
authorAbdelkader Boudih <terminale@gmail.com>2014-08-12 18:24:19 +0000
committerAbdelkader Boudih <terminale@gmail.com>2014-08-13 11:36:32 +0000
commit67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b (patch)
tree17d779714eb326cf6cfd679a64601a7072911ed0 /activejob
parent22ee993825897fe2adafebeed57158f0699b071b (diff)
downloadrails-67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b.tar.gz
rails-67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b.tar.bz2
rails-67f8b6b2bc7e7eca8723996b1303c3fafa5ed39b.zip
Added ActionMailer::DeliverLater
Diffstat (limited to 'activejob')
-rw-r--r--activejob/lib/active_job.rb2
-rw-r--r--activejob/lib/active_job/logging.rb4
-rw-r--r--activejob/lib/activejob.rb1
-rw-r--r--activejob/test/helper.rb5
4 files changed, 3 insertions, 9 deletions
diff --git a/activejob/lib/active_job.rb b/activejob/lib/active_job.rb
index ddfdda4fb4..f0a34ffb44 100644
--- a/activejob/lib/active_job.rb
+++ b/activejob/lib/active_job.rb
@@ -23,8 +23,6 @@
require 'active_support'
require 'active_support/rails'
-
-require 'active_job/railtie' if defined?(Rails)
require 'active_job/version'
module ActiveJob
diff --git a/activejob/lib/active_job/logging.rb b/activejob/lib/active_job/logging.rb
index d913aee03d..d20bc3efce 100644
--- a/activejob/lib/active_job/logging.rb
+++ b/activejob/lib/active_job/logging.rb
@@ -7,7 +7,7 @@ module ActiveJob
included do
cattr_accessor(:logger) { ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(STDOUT)) }
- around_enqueue do |job, block, _|
+ around_enqueue do |_, block, _|
tag_logger do
block.call
end
@@ -17,7 +17,7 @@ module ActiveJob
tag_logger(job.class.name, job.job_id) do
payload = {adapter: job.class.queue_adapter, job: job.class, args: job.arguments}
ActiveSupport::Notifications.instrument("perform_start.active_job", payload.dup)
- ActiveSupport::Notifications.instrument("perform.active_job", payload) do |payload|
+ ActiveSupport::Notifications.instrument("perform.active_job", payload) do
block.call
end
end
diff --git a/activejob/lib/activejob.rb b/activejob/lib/activejob.rb
deleted file mode 100644
index fea38731af..0000000000
--- a/activejob/lib/activejob.rb
+++ /dev/null
@@ -1 +0,0 @@
-require 'active_job'
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index ad263c05cd..8e255c1696 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -1,7 +1,4 @@
-require 'bundler'
-Bundler.setup
-
-$LOAD_PATH << File.dirname(__FILE__) + "/../lib"
+require File.expand_path('../../../load_paths', __FILE__)
require 'active_job'