Merge branch 'master' into loofah

Conflicts:
	actionpack/CHANGELOG.md

6 files changed, 88 insertions, 0 deletions

diff --git a/activejob/test/jobs/callback_job.rb b/activejob/test/jobs/callback_job.rb
new file mode 100644
index 0000000000..056dd073e8
--- /dev/null
+++ b/activejob/test/jobs/callback_job.rb
@@ -0,0 +1,32 @@
+class CallbackJob < ActiveJob::Base
+  before_perform ->(job) { job.history << "CallbackJob ran before_perform" }
+  after_perform  ->(job) { job.history << "CallbackJob ran after_perform"  }
+
+  before_enqueue ->(job) { job.history << "CallbackJob ran before_enqueue" }
+  after_enqueue  ->(job) { job.history << "CallbackJob ran after_enqueue"  }
+
+  around_perform :around_perform
+  around_enqueue :around_enqueue
+
+
+  def perform(person = "david")
+    # NOTHING!
+  end
+
+  def history
+    @history ||= []
+  end
+
+  # FIXME: Not sure why these can't be declared inline like before/after
+  def around_perform
+    history << "CallbackJob ran around_perform_start"
+    yield
+    history << "CallbackJob ran around_perform_stop"
+  end
+
+  def around_enqueue
+    history << "CallbackJob ran around_enqueue_start"
+    yield
+    history << "CallbackJob ran around_enqueue_stop"
+  end
+end
diff --git a/activejob/test/jobs/gid_job.rb b/activejob/test/jobs/gid_job.rb
new file mode 100644
index 0000000000..35c2366ec4
--- /dev/null
+++ b/activejob/test/jobs/gid_job.rb
@@ -0,0 +1,6 @@
+class GidJob < ActiveJob::Base
+  def perform(person)
+    JobBuffer.add("Person with ID: #{person.id}")
+  end
+end
+
diff --git a/activejob/test/jobs/hello_job.rb b/activejob/test/jobs/hello_job.rb
new file mode 100644
index 0000000000..4c6256af0d
--- /dev/null
+++ b/activejob/test/jobs/hello_job.rb
@@ -0,0 +1,5 @@
+class HelloJob < ActiveJob::Base
+  def perform(greeter = "David")
+    JobBuffer.add("#{greeter} says hello")
+  end
+end
diff --git a/activejob/test/jobs/logging_job.rb b/activejob/test/jobs/logging_job.rb
new file mode 100644
index 0000000000..d84ed8589b
--- /dev/null
+++ b/activejob/test/jobs/logging_job.rb
@@ -0,0 +1,10 @@
+class LoggingJob < ActiveJob::Base
+  def perform(dummy)
+    logger.info "Dummy, here is it: #{dummy}"
+  end
+
+  def job_id
+    "LOGGING-JOB-ID"
+  end
+end
+
diff --git a/activejob/test/jobs/nested_job.rb b/activejob/test/jobs/nested_job.rb
new file mode 100644
index 0000000000..fd66f68991
--- /dev/null
+++ b/activejob/test/jobs/nested_job.rb
@@ -0,0 +1,10 @@
+class NestedJob < ActiveJob::Base
+  def perform
+    LoggingJob.enqueue "NestedJob"
+  end
+
+  def job_id
+    "NESTED-JOB-ID"
+  end
+end
+
diff --git a/activejob/test/jobs/rescue_job.rb b/activejob/test/jobs/rescue_job.rb
new file mode 100644
index 0000000000..e9cb37d1c4
--- /dev/null
+++ b/activejob/test/jobs/rescue_job.rb
@@ -0,0 +1,25 @@
+class RescueJob < ActiveJob::Base
+  class OtherError < StandardError; end
+
+  rescue_from(ArgumentError) do
+    JobBuffer.add('rescued from ArgumentError')
+    arguments[0] = "DIFFERENT!"
+    retry_now
+  end
+
+  rescue_from(ActiveJob::DeserializationError) do |e|
+    JobBuffer.add('rescued from DeserializationError')
+    JobBuffer.add("DeserializationError original exception was #{e.original_exception.class.name}")
+  end
+
+  def perform(person = "david")
+    case person
+    when "david"
+      raise ArgumentError, "Hair too good"
+    when "other"
+      raise OtherError
+    else
+      JobBuffer.add('performed beautifully')
+    end
+  end
+end