diff options
author | Cristian Bica <cristian.bica@gmail.com> | 2014-08-12 13:53:46 +0300 |
---|---|---|
committer | Cristian Bica <cristian.bica@gmail.com> | 2014-08-12 13:53:46 +0300 |
commit | 3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5 (patch) | |
tree | ae592fe3a17ea77536a8b1ab2ddbbefa45dbd2c1 /activejob | |
parent | 0c232779ece1ff6bf9bce9d55c54ea19867a2170 (diff) | |
download | rails-3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5.tar.gz rails-3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5.tar.bz2 rails-3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5.zip |
Fixed failing tests; Load active_job in railtie; Renamed generator to job
Diffstat (limited to 'activejob')
-rw-r--r-- | activejob/lib/active_job/railtie.rb | 5 | ||||
-rw-r--r-- | activejob/lib/rails/generators/job/job_generator.rb (renamed from activejob/lib/rails/generators/active_job/job_generator.rb) | 4 | ||||
-rw-r--r-- | activejob/lib/rails/generators/job/templates/job.rb (renamed from activejob/lib/rails/generators/active_job/templates/job.rb) | 0 | ||||
-rw-r--r-- | activejob/test/cases/logging_test.rb | 1 | ||||
-rw-r--r-- | activejob/test/cases/queue_naming_test.rb | 4 |
5 files changed, 9 insertions, 5 deletions
diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb index 08555d1d77..16736374af 100644 --- a/activejob/lib/active_job/railtie.rb +++ b/activejob/lib/active_job/railtie.rb @@ -1,4 +1,5 @@ -require 'active_model/railtie' +require 'active_job' +require 'rails' module ActiveJob # = Active Job Railtie @@ -7,4 +8,4 @@ module ActiveJob ActiveSupport.on_load(:active_job) { self.logger = ::Rails.logger } end end -end
\ No newline at end of file +end diff --git a/activejob/lib/rails/generators/active_job/job_generator.rb b/activejob/lib/rails/generators/job/job_generator.rb index fe4af0d2cc..78a9c27606 100644 --- a/activejob/lib/rails/generators/active_job/job_generator.rb +++ b/activejob/lib/rails/generators/job/job_generator.rb @@ -1,6 +1,6 @@ require 'rails/generators/named_base' -module ActiveJob +module Rails module Generators # :nodoc: class JobGenerator < Rails::Generators::NamedBase # :nodoc: desc 'This generator creates an active job file at app/jobs' @@ -19,4 +19,4 @@ module ActiveJob end end -end
\ No newline at end of file +end diff --git a/activejob/lib/rails/generators/active_job/templates/job.rb b/activejob/lib/rails/generators/job/templates/job.rb index 6a21616d30..6a21616d30 100644 --- a/activejob/lib/rails/generators/active_job/templates/job.rb +++ b/activejob/lib/rails/generators/job/templates/job.rb diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb index a4c010c7bd..3f21fa644c 100644 --- a/activejob/test/cases/logging_test.rb +++ b/activejob/test/cases/logging_test.rb @@ -1,5 +1,6 @@ require 'helper' require "active_support/log_subscriber/test_helper" +require 'active_support/core_ext/numeric/time' require 'jobs/hello_job' require 'jobs/logging_job' require 'jobs/nested_job' diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb index 852643b9f6..7cb516bbb4 100644 --- a/activejob/test/cases/queue_naming_test.rb +++ b/activejob/test/cases/queue_naming_test.rb @@ -1,11 +1,13 @@ require 'helper' require 'jobs/hello_job' +require 'jobs/logging_job' +require 'jobs/nested_job' class QueueNamingTest < ActiveSupport::TestCase test 'name derived from base' do assert_equal "active_jobs", HelloJob.queue_name end - + test 'name appended in job' do begin HelloJob.queue_as :greetings |