From bb1ecdcc677bf6e68e0252505509c089619b5b90 Mon Sep 17 00:00:00 2001 From: Xavier Noria Date: Thu, 1 Sep 2016 23:41:49 +0200 Subject: fixes remaining RuboCop issues [Vipul A M, Xavier Noria] --- activejob/Rakefile | 2 +- activejob/lib/active_job/arguments.rb | 2 +- activejob/test/cases/exceptions_test.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'activejob') diff --git a/activejob/Rakefile b/activejob/Rakefile index da153c8a49..3953116061 100644 --- a/activejob/Rakefile +++ b/activejob/Rakefile @@ -46,7 +46,7 @@ namespace :test do dir = File.dirname(__FILE__) Dir.glob("#{dir}/test/cases/**/*_test.rb").all? do |file| sh(Gem.ruby, "-w", "-I#{dir}/lib", "-I#{dir}/test", file) - end or raise "Failures" + end || raise("Failures") end end diff --git a/activejob/lib/active_job/arguments.rb b/activejob/lib/active_job/arguments.rb index d94b015014..41ce5f863b 100644 --- a/activejob/lib/active_job/arguments.rb +++ b/activejob/lib/active_job/arguments.rb @@ -104,7 +104,7 @@ module ActiveJob end def serialized_global_id?(hash) - hash.size == 1 and hash.include?(GLOBALID_KEY) + hash.size == 1 && hash.include?(GLOBALID_KEY) end def deserialize_global_id(hash) diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb index 9ee1dbfa0a..dbe55f7430 100644 --- a/activejob/test/cases/exceptions_test.rb +++ b/activejob/test/cases/exceptions_test.rb @@ -58,7 +58,7 @@ class ExceptionsTest < ActiveJob::TestCase test "custom handling of job that exceeds retry attempts" do perform_enqueued_jobs do - RetryJob.perform_later 'CustomCatchError', 6 + RetryJob.perform_later "CustomCatchError", 6 assert_equal "Dealt with a job that failed to retry in a custom way after 6 attempts", JobBuffer.last_value end end -- cgit v1.2.3