Merge branch 'passing_rails_env_option'

JustinAiken · JustinAiken · commit e2340bcd885d · 2017-01-04T13:23:56.000-07:00
diff --git a/lib/active_scheduler/resque_wrapper.rb b/lib/active_scheduler/resque_wrapper.rb
@@ -54,6 +54,7 @@ def self.wrap(schedule)
         schedule[job][:description] = opts.fetch(:description, nil) if opts.fetch(:description, nil)
         schedule[job][:every]       = opts.fetch(:every, nil)       if opts.fetch(:every, nil)
         schedule[job][:cron]        = opts.fetch(:cron, nil)        if opts.fetch(:cron, nil)
+        schedule[job][:rails_env]   = opts.fetch(:rails_env, nil)   if opts.fetch(:rails_env, nil)
       end
     end
   end
diff --git a/spec/active_scheduler/resque_wrapper_spec.rb b/spec/active_scheduler/resque_wrapper_spec.rb
@@ -15,6 +15,7 @@
           "queue"       => "simple",
           "description" => "It's a simple job.",
           "every"       => "30s",
+          "rails_env"   => "test",
           "args"        => [{
             "job_class"  => "SimpleJob",
             "queue_name" => "simple",
@@ -31,6 +32,7 @@
             "queue"       => "simple",
             "description" => "It's a simple job.",
             "every"       => "30s",
+            "rails_env"   => "test",
             "args"        => ['foo-arg-1', 'foo-arg-2'],
           )
         end
diff --git a/spec/fixtures/simple_job.yaml b/spec/fixtures/simple_job.yaml
@@ -2,6 +2,7 @@ simple_job:
   every: "30s"
   queue: "simple"
   class: "SimpleJob"
+  rails_env: "test"
   args:
     - foo-arg-1
     - foo-arg-2
