diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 08:06:33 -0700 |
|---|---|---|
| committer | Sean Griffin <sean@seantheprogrammer.com> | 2015-11-23 08:06:33 -0700 |
| commit | 9e486905815e711e8d291da3e15f883e55249668 (patch) | |
| tree | feeb8e7d8bca174f9a8a35a7e8d2877a470ab531 /activejob/test/integration | |
| parent | 4547e894e9f924221f1ec4ff8e71fa750bab3595 (diff) | |
| parent | 171e788ccd508caad5389edfe04e304a0da344a1 (diff) | |
| download | rails-9e486905815e711e8d291da3e15f883e55249668.tar.gz rails-9e486905815e711e8d291da3e15f883e55249668.tar.bz2 rails-9e486905815e711e8d291da3e15f883e55249668.zip | |
Merge pull request #22380 from wjessop/fix_race_in_aj_integration_tests
Fix race condition testing for job execution order
Diffstat (limited to 'activejob/test/integration')
| -rw-r--r-- | activejob/test/integration/queuing_test.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb index e435ed4aa6..d8425c9706 100644 --- a/activejob/test/integration/queuing_test.rb +++ b/activejob/test/integration/queuing_test.rb @@ -78,7 +78,7 @@ class QueuingTest < ActiveSupport::TestCase TestJob.perform_later @id wait_for_jobs_to_finish_for(5.seconds) assert job_executed - assert_equal 'de', job_output + assert_equal 'de', job_executed_in_locale ensure I18n.available_locales = [:en] I18n.locale = :en |