Merge branch '4-0-dev' into fix-build-4-0-dev

Author: JonRowe

.travis.yml

@@ -87,10 +87,10 @@ matrix:
     - rvm: 2.4.6
       env: RAILS_VERSION='~> 4.2.0'
     - rvm: 2.4.6
-      env: RAILS_VERSION=4-2-stable
+      env: RAILS_VERSION='~> 4.2.0'
     - rvm: 2.3.8
       env: RAILS_VERSION='~> 4.2.0'
     - rvm: 2.3.8
-      env: RAILS_VERSION=4-2-stable
+      env: RAILS_VERSION='~> 4.2.0'
 
   fast_finish: true

Changelog.md

@@ -9,6 +9,7 @@ Enhancements:
 * Add ActionCable spec helpers and test type (Vladimir Dementyev, #2113)
 * Add support for partial args when using `have_enqueued_mail`
   (Ignatius Reza, #2125)
+* Add support for time arguments for `have_enqueued_job` (@alpaca-tc, #2157)
 
 Bug Fixes:
 

lib/rspec/rails/matchers/active_job.rb

@@ -140,8 +140,9 @@ def job_match?(job)
 
           def arguments_match?(job)
             if @args.any?
+              args = serialize_and_deserialize_arguments(@args)
               deserialized_args = deserialize_arguments(job)
-              RSpec::Mocks::ArgumentListMatcher.new(*@args).args_match?(*deserialized_args)
+              RSpec::Mocks::ArgumentListMatcher.new(*args).args_match?(*deserialized_args)
             else
               true
             end
@@ -172,6 +173,13 @@ def set_expected_number(relativity, count)
                                end
           end
 
+          def serialize_and_deserialize_arguments(args)
+            serialized = ::ActiveJob::Arguments.serialize(args)
+            ::ActiveJob::Arguments.deserialize(serialized)
+          rescue ::ActiveJob::SerializationError
+            args
+          end
+
           def deserialize_arguments(job)
             ::ActiveJob::Arguments.deserialize(job[:args])
           rescue ::ActiveJob::DeserializationError

script/downgrade_bundler_on_old_rails

@@ -8,10 +8,13 @@ source script/functions.sh
 if ruby -e "exit(ENV['RAILS_VERSION'].scan(/\d+\.\d+.\d+/)[0].to_f < 5)"; then
   # On Rails versions less than 5, Bundler 2.0 is not supported
   echo "Warning dowgrading to older version of Bundler"
+  echo "Current bundler versions installed: `gem list | grep '^bundler ('`"
 
   gem uninstall -aIx bundler || echo "Warning error occured removing bundler via gem"
 
   rvm @global do gem uninstall -aIx bundler || echo "Warning error occured removing bundler via rvm"
 
+  echo "Bundler version list after uninstall: `gem list | grep '^bundler ('`"
+
   gem install bundler -v '1.17.3'
 fi

spec/rspec/rails/matchers/active_job_spec.rb

@@ -328,6 +328,24 @@ def self.name; "LoggingJob"; end
         expect(arg).to eq("asdf")
       }
     end
+
+    if Rails.version.to_f >= 6.0
+      it "passes with Time" do
+        usec_time = Time.iso8601('2016-07-01T00:00:00.000001Z')
+
+        expect {
+          hello_job.perform_later(usec_time)
+        }.to have_enqueued_job(hello_job).with(usec_time)
+      end
+
+      it "passes with ActiveSupport::TimeWithZone" do
+        usec_time = Time.iso8601('2016-07-01T00:00:00.000001Z').in_time_zone
+
+        expect {
+          hello_job.perform_later(usec_time)
+        }.to have_enqueued_job(hello_job).with(usec_time)
+      end
+    end
   end
 
   describe "have_been_enqueued" do