diff options
| author | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-17 20:24:44 -0300 |
|---|---|---|
| committer | Willian Gustavo Veiga <beberveiga@gmail.com> | 2018-10-17 20:24:44 -0300 |
| commit | c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397 (patch) | |
| tree | e72e4476555fbee75961e473ce336c08fdd10fa6 /activejob | |
| parent | 99bd626885b72acd44861727918ee107a649e2b4 (diff) | |
| parent | ead868315f9b0fedb351c9b451aa1f66a2dc8038 (diff) | |
| download | rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.tar.gz rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.tar.bz2 rails-c8ff9bd63a2371b6f0f0b4f48abf29cf89a1d397.zip | |
Merge branch 'master' into feature/reselect-method
Diffstat (limited to 'activejob')
| -rw-r--r-- | activejob/lib/active_job/queue_adapters/async_adapter.rb | 2 | ||||
| -rw-r--r-- | activejob/lib/active_job/test_helper.rb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/activejob/lib/active_job/queue_adapters/async_adapter.rb b/activejob/lib/active_job/queue_adapters/async_adapter.rb index ebf6f384e3..53a7e3d53e 100644 --- a/activejob/lib/active_job/queue_adapters/async_adapter.rb +++ b/activejob/lib/active_job/queue_adapters/async_adapter.rb @@ -31,7 +31,7 @@ module ActiveJob # jobs. Since jobs share a single thread pool, long-running jobs will block # short-lived jobs. Fine for dev/test; bad for production. class AsyncAdapter - # See {Concurrent::ThreadPoolExecutor}[https://ruby-concurrency.github.io/concurrent-ruby/Concurrent/ThreadPoolExecutor.html] for executor options. + # See {Concurrent::ThreadPoolExecutor}[https://ruby-concurrency.github.io/concurrent-ruby/master/Concurrent/ThreadPoolExecutor.html] for executor options. def initialize(**executor_options) @scheduler = Scheduler.new(**executor_options) end diff --git a/activejob/lib/active_job/test_helper.rb b/activejob/lib/active_job/test_helper.rb index 261b68d4f8..229855c5d9 100644 --- a/activejob/lib/active_job/test_helper.rb +++ b/activejob/lib/active_job/test_helper.rb @@ -197,7 +197,7 @@ module ActiveJob # assert_performed_jobs 2 # end # - # If a block is passed, that block should cause the specified number of + # If a block is passed, asserts that the block will cause the specified number of # jobs to be performed. # # def test_jobs_again @@ -279,7 +279,7 @@ module ActiveJob # end # end # - # If a block is passed, that block should not cause any job to be performed. + # If a block is passed, asserts that the block will not cause any job to be performed. # # def test_jobs_again # assert_no_performed_jobs do @@ -347,7 +347,7 @@ module ActiveJob # end # # - # If a block is passed, that block should cause the job to be + # If a block is passed, asserts that the block will cause the job to be # enqueued with the given arguments. # # def test_assert_enqueued_with |