diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-25 23:50:33 -0300 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2015-09-25 23:50:33 -0300 |
commit | 0f89e15e803a19b427feae593bc7127b64bf357c (patch) | |
tree | 49b759b3cb5794203406621e98ba3cdd282e4b96 /activejob/test/support | |
parent | ae1f295d4b2c715b1de00816df530ecbd281ceea (diff) | |
parent | 7059ab35f797c163cd8907abcd7d0830b31e56f7 (diff) | |
download | rails-0f89e15e803a19b427feae593bc7127b64bf357c.tar.gz rails-0f89e15e803a19b427feae593bc7127b64bf357c.tar.bz2 rails-0f89e15e803a19b427feae593bc7127b64bf357c.zip |
Merge pull request #19425 from wvengen/feature/activejob-priority-master
Add job priorities to ActiveJob
Diffstat (limited to 'activejob/test/support')
-rw-r--r-- | activejob/test/support/integration/test_case_helpers.rb | 8 | ||||
-rw-r--r-- | activejob/test/support/que/inline.rb | 1 |
2 files changed, 7 insertions, 2 deletions
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb index 39aee6d407..8319d09520 100644 --- a/activejob/test/support/integration/test_case_helpers.rb +++ b/activejob/test/support/integration/test_case_helpers.rb @@ -42,8 +42,12 @@ module TestCaseHelpers end end - def job_executed - Dummy::Application.root.join("tmp/#{@id}").exist? + def job_executed(id=@id) + Dummy::Application.root.join("tmp/#{id}").exist? + end + + def job_executed_at(id=@id) + File.new(Dummy::Application.root.join("tmp/#{id}")).ctime end def job_output diff --git a/activejob/test/support/que/inline.rb b/activejob/test/support/que/inline.rb index 0232da1370..0950e52d28 100644 --- a/activejob/test/support/que/inline.rb +++ b/activejob/test/support/que/inline.rb @@ -6,6 +6,7 @@ Que::Job.class_eval do if args.last.is_a?(Hash) options = args.pop options.delete(:run_at) + options.delete(:priority) args << options unless options.empty? end self.run(*args) |