diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2018-02-22 16:41:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-22 16:41:26 +0000 |
| commit | f85c77bef9efd8ffa97a59e87320e55e486e30c2 (patch) | |
| tree | 3c44b3d0c7068dd1d77726aef50e2862e3cb8a06 /activejob/test/support | |
| parent | e20742f12b362676e8f69fe68c3193ad80a90172 (diff) | |
| parent | a9d1167b1fdae6f5f5496738b3e7d1e05949dcd0 (diff) | |
| download | rails-f85c77bef9efd8ffa97a59e87320e55e486e30c2.tar.gz rails-f85c77bef9efd8ffa97a59e87320e55e486e30c2.tar.bz2 rails-f85c77bef9efd8ffa97a59e87320e55e486e30c2.zip | |
Merge pull request #32085 from rails/add-timezone-support-to-activejob
Add support for timezones to Active Job
Diffstat (limited to 'activejob/test/support')
| -rw-r--r-- | activejob/test/support/integration/dummy_app_template.rb | 1 | ||||
| -rw-r--r-- | activejob/test/support/integration/test_case_helpers.rb | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb index 7ea78c3350..b56dd3e591 100644 --- a/activejob/test/support/integration/dummy_app_template.rb +++ b/activejob/test/support/integration/dummy_app_template.rb @@ -21,6 +21,7 @@ class TestJob < ActiveJob::Base File.open(Rails.root.join("tmp/\#{x}.new"), "wb+") do |f| f.write Marshal.dump({ "locale" => I18n.locale.to_s || "en", + "timezone" => Time.zone.try(:name) || "UTC", "executed_at" => Time.now.to_r }) end diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb index f02a32a38e..3d9b265b66 100644 --- a/activejob/test/support/integration/test_case_helpers.rb +++ b/activejob/test/support/integration/test_case_helpers.rb @@ -62,4 +62,8 @@ module TestCaseHelpers def job_executed_in_locale(id = @id) job_data(id)["locale"] end + + def job_executed_in_timezone(id = @id) + job_data(id)["timezone"] + end end |