From b6b0c99ff3e8ace3f42813154dbe4b8ad6a98e6c Mon Sep 17 00:00:00 2001
From: Genadi Samokovarov <gsamokovarov@gmail.com>
Date: Wed, 31 May 2017 12:16:20 +0300
Subject: Use mattr_accessor default: option throughout the project

---
 activejob/test/support/delayed_job/delayed/backend/test.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'activejob/test')

diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb
index 98d731ff1e..68288c062b 100644
--- a/activejob/test/support/delayed_job/delayed/backend/test.rb
+++ b/activejob/test/support/delayed_job/delayed/backend/test.rb
@@ -19,8 +19,7 @@ module Delayed
 
         include Delayed::Backend::Base
 
-        cattr_accessor :id
-        self.id = 0
+        cattr_accessor :id, default: 0
 
         def initialize(hash = {})
           self.attempts = 0
-- 
cgit v1.2.3


From b58d73fc5771338a10fcdac7beea577b7a23ea78 Mon Sep 17 00:00:00 2001
From: utilum <oz@utilum.com>
Date: Thu, 22 Sep 2016 17:17:28 +0200
Subject: ActiveJob::Core#serialize stores provider_job_id (fixes #26581).

---
 activejob/test/cases/job_serialization_test.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'activejob/test')

diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index 3f2e300dfa..c737557ece 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -44,4 +44,12 @@ class JobSerializationTest < ActiveSupport::TestCase
     job.deserialize({})
     assert_equal "en", job.locale
   end
+
+  test "serialize stores provider_job_id" do
+    job = HelloJob.new
+    assert_nil job.serialize["provider_job_id"]
+
+    job.provider_job_id = "some value set by adapter"
+    assert_equal job.provider_job_id, job.serialize["provider_job_id"]
+  end
 end
-- 
cgit v1.2.3


From cfade1ec7ee7b5b51f3c1578e3474f9c156f2971 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Thu, 22 Jun 2017 22:59:18 -0400
Subject: Enforce frozen string in Rubocop

---
 activejob/test/adapters/async.rb                             | 1 +
 activejob/test/adapters/backburner.rb                        | 1 +
 activejob/test/adapters/delayed_job.rb                       | 1 +
 activejob/test/adapters/inline.rb                            | 1 +
 activejob/test/adapters/qu.rb                                | 1 +
 activejob/test/adapters/que.rb                               | 1 +
 activejob/test/adapters/queue_classic.rb                     | 1 +
 activejob/test/adapters/resque.rb                            | 1 +
 activejob/test/adapters/sidekiq.rb                           | 1 +
 activejob/test/adapters/sneakers.rb                          | 1 +
 activejob/test/adapters/sucker_punch.rb                      | 1 +
 activejob/test/adapters/test.rb                              | 1 +
 activejob/test/cases/adapter_test.rb                         | 1 +
 activejob/test/cases/argument_serialization_test.rb          | 1 +
 activejob/test/cases/callbacks_test.rb                       | 1 +
 activejob/test/cases/exceptions_test.rb                      | 1 +
 activejob/test/cases/job_serialization_test.rb               | 1 +
 activejob/test/cases/logging_test.rb                         | 1 +
 activejob/test/cases/queue_adapter_test.rb                   | 1 +
 activejob/test/cases/queue_naming_test.rb                    | 1 +
 activejob/test/cases/queue_priority_test.rb                  | 1 +
 activejob/test/cases/queuing_test.rb                         | 1 +
 activejob/test/cases/rescue_test.rb                          | 1 +
 activejob/test/cases/test_case_test.rb                       | 1 +
 activejob/test/cases/test_helper_test.rb                     | 1 +
 activejob/test/cases/translation_test.rb                     | 1 +
 activejob/test/helper.rb                                     | 1 +
 activejob/test/integration/queuing_test.rb                   | 1 +
 activejob/test/jobs/application_job.rb                       | 1 +
 activejob/test/jobs/callback_job.rb                          | 1 +
 activejob/test/jobs/gid_job.rb                               | 1 +
 activejob/test/jobs/hello_job.rb                             | 1 +
 activejob/test/jobs/inherited_job.rb                         | 1 +
 activejob/test/jobs/kwargs_job.rb                            | 1 +
 activejob/test/jobs/logging_job.rb                           | 1 +
 activejob/test/jobs/nested_job.rb                            | 1 +
 activejob/test/jobs/overridden_logging_job.rb                | 1 +
 activejob/test/jobs/provider_jid_job.rb                      | 1 +
 activejob/test/jobs/queue_adapter_job.rb                     | 1 +
 activejob/test/jobs/queue_as_job.rb                          | 1 +
 activejob/test/jobs/rescue_job.rb                            | 1 +
 activejob/test/jobs/retry_job.rb                             | 1 +
 activejob/test/jobs/translated_hello_job.rb                  | 1 +
 activejob/test/models/person.rb                              | 1 +
 activejob/test/support/backburner/inline.rb                  | 1 +
 activejob/test/support/delayed_job/delayed/backend/test.rb   | 1 +
 activejob/test/support/integration/adapters/async.rb         | 1 +
 activejob/test/support/integration/adapters/backburner.rb    | 1 +
 activejob/test/support/integration/adapters/delayed_job.rb   | 1 +
 activejob/test/support/integration/adapters/inline.rb        | 1 +
 activejob/test/support/integration/adapters/qu.rb            | 1 +
 activejob/test/support/integration/adapters/que.rb           | 1 +
 activejob/test/support/integration/adapters/queue_classic.rb | 1 +
 activejob/test/support/integration/adapters/resque.rb        | 1 +
 activejob/test/support/integration/adapters/sidekiq.rb       | 1 +
 activejob/test/support/integration/adapters/sneakers.rb      | 1 +
 activejob/test/support/integration/adapters/sucker_punch.rb  | 1 +
 activejob/test/support/integration/dummy_app_template.rb     | 1 +
 activejob/test/support/integration/helper.rb                 | 1 +
 activejob/test/support/integration/jobs_manager.rb           | 1 +
 activejob/test/support/integration/test_case_helpers.rb      | 1 +
 activejob/test/support/job_buffer.rb                         | 1 +
 activejob/test/support/que/inline.rb                         | 1 +
 activejob/test/support/queue_classic/inline.rb               | 1 +
 activejob/test/support/sneakers/inline.rb                    | 1 +
 65 files changed, 65 insertions(+)

(limited to 'activejob/test')

diff --git a/activejob/test/adapters/async.rb b/activejob/test/adapters/async.rb
index 08eb9658cd..d5a61d7684 100644
--- a/activejob/test/adapters/async.rb
+++ b/activejob/test/adapters/async.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :async
 ActiveJob::Base.queue_adapter.immediate = true
diff --git a/activejob/test/adapters/backburner.rb b/activejob/test/adapters/backburner.rb
index 17ba07b802..cfc97432f2 100644
--- a/activejob/test/adapters/backburner.rb
+++ b/activejob/test/adapters/backburner.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "support/backburner/inline"
 
 ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/adapters/delayed_job.rb b/activejob/test/adapters/delayed_job.rb
index 98e41c0c36..3aa646555a 100644
--- a/activejob/test/adapters/delayed_job.rb
+++ b/activejob/test/adapters/delayed_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :delayed_job
 
 $LOAD_PATH << File.expand_path("../support/delayed_job", __dir__)
diff --git a/activejob/test/adapters/inline.rb b/activejob/test/adapters/inline.rb
index 24113dfa5a..ec3f0940e6 100644
--- a/activejob/test/adapters/inline.rb
+++ b/activejob/test/adapters/inline.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/adapters/qu.rb b/activejob/test/adapters/qu.rb
index b89c504091..f8e7eb624d 100644
--- a/activejob/test/adapters/qu.rb
+++ b/activejob/test/adapters/qu.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "qu-immediate"
 
 ActiveJob::Base.queue_adapter = :qu
diff --git a/activejob/test/adapters/que.rb b/activejob/test/adapters/que.rb
index 0c49274a4e..0d27bb8fc9 100644
--- a/activejob/test/adapters/que.rb
+++ b/activejob/test/adapters/que.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "support/que/inline"
 
 ActiveJob::Base.queue_adapter = :que
diff --git a/activejob/test/adapters/queue_classic.rb b/activejob/test/adapters/queue_classic.rb
index e301a7ca96..f57057c914 100644
--- a/activejob/test/adapters/queue_classic.rb
+++ b/activejob/test/adapters/queue_classic.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "support/queue_classic/inline"
 ActiveJob::Base.queue_adapter = :queue_classic
diff --git a/activejob/test/adapters/resque.rb b/activejob/test/adapters/resque.rb
index af7080358d..6c732c1e33 100644
--- a/activejob/test/adapters/resque.rb
+++ b/activejob/test/adapters/resque.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :resque
 Resque.inline = true
diff --git a/activejob/test/adapters/sidekiq.rb b/activejob/test/adapters/sidekiq.rb
index 8036331ef1..6cc64e7684 100644
--- a/activejob/test/adapters/sidekiq.rb
+++ b/activejob/test/adapters/sidekiq.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "sidekiq/testing/inline"
 ActiveJob::Base.queue_adapter = :sidekiq
diff --git a/activejob/test/adapters/sneakers.rb b/activejob/test/adapters/sneakers.rb
index 159c0d1906..85f6b74144 100644
--- a/activejob/test/adapters/sneakers.rb
+++ b/activejob/test/adapters/sneakers.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "support/sneakers/inline"
 ActiveJob::Base.queue_adapter = :sneakers
diff --git a/activejob/test/adapters/sucker_punch.rb b/activejob/test/adapters/sucker_punch.rb
index 5661b6ee92..45b5fa1db2 100644
--- a/activejob/test/adapters/sucker_punch.rb
+++ b/activejob/test/adapters/sucker_punch.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "sucker_punch/testing/inline"
 ActiveJob::Base.queue_adapter = :sucker_punch
diff --git a/activejob/test/adapters/test.rb b/activejob/test/adapters/test.rb
index 7180b38a57..965f7e91a2 100644
--- a/activejob/test/adapters/test.rb
+++ b/activejob/test/adapters/test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :test
 ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
 ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = true
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
index caf5d44a5e..764ce3ccbc 100644
--- a/activejob/test/cases/adapter_test.rb
+++ b/activejob/test/cases/adapter_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 
 class AdapterTest < ActiveSupport::TestCase
diff --git a/activejob/test/cases/argument_serialization_test.rb b/activejob/test/cases/argument_serialization_test.rb
index 7934d8e556..ebd9a4fe41 100644
--- a/activejob/test/cases/argument_serialization_test.rb
+++ b/activejob/test/cases/argument_serialization_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "active_job/arguments"
 require "models/person"
diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
index 8d1c9c3058..fbca367ae9 100644
--- a/activejob/test/cases/callbacks_test.rb
+++ b/activejob/test/cases/callbacks_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/callback_job"
 
diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
index dbe55f7430..5f56d47e8e 100644
--- a/activejob/test/cases/exceptions_test.rb
+++ b/activejob/test/cases/exceptions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/retry_job"
 
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index c737557ece..fa8d98ddca 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/gid_job"
 require "jobs/hello_job"
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index d5ca0f385c..117d9b23a3 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "active_support/log_subscriber/test_helper"
 require "active_support/core_ext/numeric/time"
diff --git a/activejob/test/cases/queue_adapter_test.rb b/activejob/test/cases/queue_adapter_test.rb
index 8368107bdf..6061fb2127 100644
--- a/activejob/test/cases/queue_adapter_test.rb
+++ b/activejob/test/cases/queue_adapter_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 
 module ActiveJob
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
index 0247bc111e..8ba4324c46 100644
--- a/activejob/test/cases/queue_naming_test.rb
+++ b/activejob/test/cases/queue_naming_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "jobs/logging_job"
diff --git a/activejob/test/cases/queue_priority_test.rb b/activejob/test/cases/queue_priority_test.rb
index 171fb1e593..416498c270 100644
--- a/activejob/test/cases/queue_priority_test.rb
+++ b/activejob/test/cases/queue_priority_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 
diff --git a/activejob/test/cases/queuing_test.rb b/activejob/test/cases/queuing_test.rb
index a3ecb15c31..44f674a2ee 100644
--- a/activejob/test/cases/queuing_test.rb
+++ b/activejob/test/cases/queuing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "active_support/core_ext/numeric/time"
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
index afb1b48831..c2a991cb2d 100644
--- a/activejob/test/cases/rescue_test.rb
+++ b/activejob/test/cases/rescue_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/rescue_job"
 require "models/person"
diff --git a/activejob/test/cases/test_case_test.rb b/activejob/test/cases/test_case_test.rb
index 3db2d9dec7..eb320a98d1 100644
--- a/activejob/test/cases/test_case_test.rb
+++ b/activejob/test/cases/test_case_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "jobs/logging_job"
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 81e75b4374..0f8174663e 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "active_support/core_ext/time"
 require "active_support/core_ext/date"
diff --git a/activejob/test/cases/translation_test.rb b/activejob/test/cases/translation_test.rb
index 27bfd50985..d6782a38bd 100644
--- a/activejob/test/cases/translation_test.rb
+++ b/activejob/test/cases/translation_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/translated_hello_job"
 
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index db07ecab7a..edcf159056 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_job"
 require "support/job_buffer"
 
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 2669c52a1c..72c66d111f 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/logging_job"
 require "jobs/hello_job"
diff --git a/activejob/test/jobs/application_job.rb b/activejob/test/jobs/application_job.rb
index a009ace51c..32fe70b8e4 100644
--- a/activejob/test/jobs/application_job.rb
+++ b/activejob/test/jobs/application_job.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class ApplicationJob < ActiveJob::Base
 end
diff --git a/activejob/test/jobs/callback_job.rb b/activejob/test/jobs/callback_job.rb
index ca2a8e031a..7c5b161437 100644
--- a/activejob/test/jobs/callback_job.rb
+++ b/activejob/test/jobs/callback_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CallbackJob < ActiveJob::Base
   before_perform ->(job) { job.history << "CallbackJob ran before_perform" }
   after_perform ->(job) { job.history << "CallbackJob ran after_perform" }
diff --git a/activejob/test/jobs/gid_job.rb b/activejob/test/jobs/gid_job.rb
index c7cfa6e7a2..c43e25a796 100644
--- a/activejob/test/jobs/gid_job.rb
+++ b/activejob/test/jobs/gid_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class GidJob < ActiveJob::Base
diff --git a/activejob/test/jobs/hello_job.rb b/activejob/test/jobs/hello_job.rb
index 126fefae00..79e1d6a6f4 100644
--- a/activejob/test/jobs/hello_job.rb
+++ b/activejob/test/jobs/hello_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class HelloJob < ActiveJob::Base
diff --git a/activejob/test/jobs/inherited_job.rb b/activejob/test/jobs/inherited_job.rb
index 60fca66f88..58b6582154 100644
--- a/activejob/test/jobs/inherited_job.rb
+++ b/activejob/test/jobs/inherited_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "application_job"
 
 class InheritedJob < ApplicationJob
diff --git a/activejob/test/jobs/kwargs_job.rb b/activejob/test/jobs/kwargs_job.rb
index 9f9d809673..ccd9811595 100644
--- a/activejob/test/jobs/kwargs_job.rb
+++ b/activejob/test/jobs/kwargs_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class KwargsJob < ActiveJob::Base
diff --git a/activejob/test/jobs/logging_job.rb b/activejob/test/jobs/logging_job.rb
index 119b32fa67..1a47601fde 100644
--- a/activejob/test/jobs/logging_job.rb
+++ b/activejob/test/jobs/logging_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class LoggingJob < ActiveJob::Base
   def perform(dummy)
     logger.info "Dummy, here is it: #{dummy}"
diff --git a/activejob/test/jobs/nested_job.rb b/activejob/test/jobs/nested_job.rb
index 21b7692cd1..891a2f952e 100644
--- a/activejob/test/jobs/nested_job.rb
+++ b/activejob/test/jobs/nested_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class NestedJob < ActiveJob::Base
   def perform
     LoggingJob.perform_later "NestedJob"
diff --git a/activejob/test/jobs/overridden_logging_job.rb b/activejob/test/jobs/overridden_logging_job.rb
index 2b17a65142..808d6e30e6 100644
--- a/activejob/test/jobs/overridden_logging_job.rb
+++ b/activejob/test/jobs/overridden_logging_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class OverriddenLoggingJob < ActiveJob::Base
   def perform(dummy)
     logger.info "Dummy, here is it: #{dummy}"
diff --git a/activejob/test/jobs/provider_jid_job.rb b/activejob/test/jobs/provider_jid_job.rb
index 0c8ba040f5..71ed23e9bb 100644
--- a/activejob/test/jobs/provider_jid_job.rb
+++ b/activejob/test/jobs/provider_jid_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class ProviderJidJob < ActiveJob::Base
diff --git a/activejob/test/jobs/queue_adapter_job.rb b/activejob/test/jobs/queue_adapter_job.rb
index 160dfd74ec..7058ab2087 100644
--- a/activejob/test/jobs/queue_adapter_job.rb
+++ b/activejob/test/jobs/queue_adapter_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class QueueAdapterJob < ActiveJob::Base
   self.queue_adapter = :inline
 end
diff --git a/activejob/test/jobs/queue_as_job.rb b/activejob/test/jobs/queue_as_job.rb
index 7dc318e736..ab3075aa77 100644
--- a/activejob/test/jobs/queue_as_job.rb
+++ b/activejob/test/jobs/queue_as_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class QueueAsJob < ActiveJob::Base
diff --git a/activejob/test/jobs/rescue_job.rb b/activejob/test/jobs/rescue_job.rb
index 62add4271a..fd78820bfe 100644
--- a/activejob/test/jobs/rescue_job.rb
+++ b/activejob/test/jobs/rescue_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class RescueJob < ActiveJob::Base
diff --git a/activejob/test/jobs/retry_job.rb b/activejob/test/jobs/retry_job.rb
index c02febc50c..b121296441 100644
--- a/activejob/test/jobs/retry_job.rb
+++ b/activejob/test/jobs/retry_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 require "active_support/core_ext/integer/inflections"
 
diff --git a/activejob/test/jobs/translated_hello_job.rb b/activejob/test/jobs/translated_hello_job.rb
index 56e9f147b9..67ddca2f41 100644
--- a/activejob/test/jobs/translated_hello_job.rb
+++ b/activejob/test/jobs/translated_hello_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class TranslatedHelloJob < ActiveJob::Base
diff --git a/activejob/test/models/person.rb b/activejob/test/models/person.rb
index b5d68ad9c1..bcd1018782 100644
--- a/activejob/test/models/person.rb
+++ b/activejob/test/models/person.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Person
   class RecordNotFound < StandardError; end
 
diff --git a/activejob/test/support/backburner/inline.rb b/activejob/test/support/backburner/inline.rb
index 9758332b6f..304f9c781c 100644
--- a/activejob/test/support/backburner/inline.rb
+++ b/activejob/test/support/backburner/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "backburner"
 
 Backburner::Worker.class_eval do
diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb
index 68288c062b..ed3b252042 100644
--- a/activejob/test/support/delayed_job/delayed/backend/test.rb
+++ b/activejob/test/support/delayed_job/delayed/backend/test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #copied from https://github.com/collectiveidea/delayed_job/blob/master/spec/delayed/backend/test.rb
 require "ostruct"
 
diff --git a/activejob/test/support/integration/adapters/async.rb b/activejob/test/support/integration/adapters/async.rb
index 44ab98437a..19aea8472e 100644
--- a/activejob/test/support/integration/adapters/async.rb
+++ b/activejob/test/support/integration/adapters/async.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module AsyncJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :async
diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb
index 2e194933a1..fd1e7697c5 100644
--- a/activejob/test/support/integration/adapters/backburner.rb
+++ b/activejob/test/support/integration/adapters/backburner.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BackburnerJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/support/integration/adapters/delayed_job.rb b/activejob/test/support/integration/adapters/delayed_job.rb
index 2adbbcd88f..73e1a04e45 100644
--- a/activejob/test/support/integration/adapters/delayed_job.rb
+++ b/activejob/test/support/integration/adapters/delayed_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "delayed_job"
 require "delayed_job_active_record"
 
diff --git a/activejob/test/support/integration/adapters/inline.rb b/activejob/test/support/integration/adapters/inline.rb
index e06b34c976..c669793dba 100644
--- a/activejob/test/support/integration/adapters/inline.rb
+++ b/activejob/test/support/integration/adapters/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module InlineJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
index 71819f5a55..b2f63d8f94 100644
--- a/activejob/test/support/integration/adapters/qu.rb
+++ b/activejob/test/support/integration/adapters/qu.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QuJobsManager
   def setup
     require "qu-rails"
diff --git a/activejob/test/support/integration/adapters/que.rb b/activejob/test/support/integration/adapters/que.rb
index 20faee3427..cf1160d2bc 100644
--- a/activejob/test/support/integration/adapters/que.rb
+++ b/activejob/test/support/integration/adapters/que.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueJobsManager
   def setup
     require "sequel"
diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb
index 369693e947..7f1308c5d3 100644
--- a/activejob/test/support/integration/adapters/queue_classic.rb
+++ b/activejob/test/support/integration/adapters/queue_classic.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueueClassicJobsManager
   def setup
     ENV["QC_DATABASE_URL"] ||= "postgres:///active_jobs_qc_int_test"
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb
index a21a1786c9..ef2dd75687 100644
--- a/activejob/test/support/integration/adapters/resque.rb
+++ b/activejob/test/support/integration/adapters/resque.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ResqueJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :resque
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index bbb575f6da..8c90410e76 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sidekiq/api"
 
 require "sidekiq/testing"
diff --git a/activejob/test/support/integration/adapters/sneakers.rb b/activejob/test/support/integration/adapters/sneakers.rb
index 1c8dfaca59..dc42501ff3 100644
--- a/activejob/test/support/integration/adapters/sneakers.rb
+++ b/activejob/test/support/integration/adapters/sneakers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sneakers/runner"
 require "sneakers/publisher"
 require "timeout"
diff --git a/activejob/test/support/integration/adapters/sucker_punch.rb b/activejob/test/support/integration/adapters/sucker_punch.rb
index 9c0d66b469..e528f24261 100644
--- a/activejob/test/support/integration/adapters/sucker_punch.rb
+++ b/activejob/test/support/integration/adapters/sucker_punch.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SuckerPunchJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :sucker_punch
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb
index 14fe3c9adc..a054ecea08 100644
--- a/activejob/test/support/integration/dummy_app_template.rb
+++ b/activejob/test/support/integration/dummy_app_template.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 if ENV["AJ_ADAPTER"] == "delayed_job"
   generate "delayed_job:active_record", "--quiet"
 end
diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb
index 545b62752e..c0aa14c4c2 100644
--- a/activejob/test/support/integration/helper.rb
+++ b/activejob/test/support/integration/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 puts "\n\n*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n"
 
 ENV["RAILS_ENV"] = "test"
diff --git a/activejob/test/support/integration/jobs_manager.rb b/activejob/test/support/integration/jobs_manager.rb
index 488756437b..1cfbd60dc4 100644
--- a/activejob/test/support/integration/jobs_manager.rb
+++ b/activejob/test/support/integration/jobs_manager.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class JobsManager
   @@managers = {}
   attr :adapter_name
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb
index 41bf9c89d1..add719187c 100644
--- a/activejob/test/support/integration/test_case_helpers.rb
+++ b/activejob/test/support/integration/test_case_helpers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/core_ext/string/inflections"
 require "support/integration/jobs_manager"
 
diff --git a/activejob/test/support/job_buffer.rb b/activejob/test/support/job_buffer.rb
index 620cb5288d..3146d06d54 100644
--- a/activejob/test/support/job_buffer.rb
+++ b/activejob/test/support/job_buffer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JobBuffer
   class << self
     def clear
diff --git a/activejob/test/support/que/inline.rb b/activejob/test/support/que/inline.rb
index 55eb0d01ef..e204f8154a 100644
--- a/activejob/test/support/que/inline.rb
+++ b/activejob/test/support/que/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "que"
 
 Que::Job.class_eval do
diff --git a/activejob/test/support/queue_classic/inline.rb b/activejob/test/support/queue_classic/inline.rb
index dcd834ecce..955469e5a8 100644
--- a/activejob/test/support/queue_classic/inline.rb
+++ b/activejob/test/support/queue_classic/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "queue_classic"
 
 module QC
diff --git a/activejob/test/support/sneakers/inline.rb b/activejob/test/support/sneakers/inline.rb
index cf102ae5c2..46882870d5 100644
--- a/activejob/test/support/sneakers/inline.rb
+++ b/activejob/test/support/sneakers/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sneakers"
 
 module Sneakers
-- 
cgit v1.2.3


From 87b3e226d65ac1ed371620bfdcd2f950c87cfece Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Sun, 2 Jul 2017 02:15:17 +0930
Subject: Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"

This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing
changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
---
 activejob/test/adapters/async.rb                             | 1 -
 activejob/test/adapters/backburner.rb                        | 1 -
 activejob/test/adapters/delayed_job.rb                       | 1 -
 activejob/test/adapters/inline.rb                            | 1 -
 activejob/test/adapters/qu.rb                                | 1 -
 activejob/test/adapters/que.rb                               | 1 -
 activejob/test/adapters/queue_classic.rb                     | 1 -
 activejob/test/adapters/resque.rb                            | 1 -
 activejob/test/adapters/sidekiq.rb                           | 1 -
 activejob/test/adapters/sneakers.rb                          | 1 -
 activejob/test/adapters/sucker_punch.rb                      | 1 -
 activejob/test/adapters/test.rb                              | 1 -
 activejob/test/cases/adapter_test.rb                         | 1 -
 activejob/test/cases/argument_serialization_test.rb          | 1 -
 activejob/test/cases/callbacks_test.rb                       | 1 -
 activejob/test/cases/exceptions_test.rb                      | 1 -
 activejob/test/cases/job_serialization_test.rb               | 1 -
 activejob/test/cases/logging_test.rb                         | 1 -
 activejob/test/cases/queue_adapter_test.rb                   | 1 -
 activejob/test/cases/queue_naming_test.rb                    | 1 -
 activejob/test/cases/queue_priority_test.rb                  | 1 -
 activejob/test/cases/queuing_test.rb                         | 1 -
 activejob/test/cases/rescue_test.rb                          | 1 -
 activejob/test/cases/test_case_test.rb                       | 1 -
 activejob/test/cases/test_helper_test.rb                     | 1 -
 activejob/test/cases/translation_test.rb                     | 1 -
 activejob/test/helper.rb                                     | 1 -
 activejob/test/integration/queuing_test.rb                   | 1 -
 activejob/test/jobs/application_job.rb                       | 1 -
 activejob/test/jobs/callback_job.rb                          | 1 -
 activejob/test/jobs/gid_job.rb                               | 1 -
 activejob/test/jobs/hello_job.rb                             | 1 -
 activejob/test/jobs/inherited_job.rb                         | 1 -
 activejob/test/jobs/kwargs_job.rb                            | 1 -
 activejob/test/jobs/logging_job.rb                           | 1 -
 activejob/test/jobs/nested_job.rb                            | 1 -
 activejob/test/jobs/overridden_logging_job.rb                | 1 -
 activejob/test/jobs/provider_jid_job.rb                      | 1 -
 activejob/test/jobs/queue_adapter_job.rb                     | 1 -
 activejob/test/jobs/queue_as_job.rb                          | 1 -
 activejob/test/jobs/rescue_job.rb                            | 1 -
 activejob/test/jobs/retry_job.rb                             | 1 -
 activejob/test/jobs/translated_hello_job.rb                  | 1 -
 activejob/test/models/person.rb                              | 1 -
 activejob/test/support/backburner/inline.rb                  | 1 -
 activejob/test/support/delayed_job/delayed/backend/test.rb   | 1 -
 activejob/test/support/integration/adapters/async.rb         | 1 -
 activejob/test/support/integration/adapters/backburner.rb    | 1 -
 activejob/test/support/integration/adapters/delayed_job.rb   | 1 -
 activejob/test/support/integration/adapters/inline.rb        | 1 -
 activejob/test/support/integration/adapters/qu.rb            | 1 -
 activejob/test/support/integration/adapters/que.rb           | 1 -
 activejob/test/support/integration/adapters/queue_classic.rb | 1 -
 activejob/test/support/integration/adapters/resque.rb        | 1 -
 activejob/test/support/integration/adapters/sidekiq.rb       | 1 -
 activejob/test/support/integration/adapters/sneakers.rb      | 1 -
 activejob/test/support/integration/adapters/sucker_punch.rb  | 1 -
 activejob/test/support/integration/dummy_app_template.rb     | 1 -
 activejob/test/support/integration/helper.rb                 | 1 -
 activejob/test/support/integration/jobs_manager.rb           | 1 -
 activejob/test/support/integration/test_case_helpers.rb      | 1 -
 activejob/test/support/job_buffer.rb                         | 1 -
 activejob/test/support/que/inline.rb                         | 1 -
 activejob/test/support/queue_classic/inline.rb               | 1 -
 activejob/test/support/sneakers/inline.rb                    | 1 -
 65 files changed, 65 deletions(-)

(limited to 'activejob/test')

diff --git a/activejob/test/adapters/async.rb b/activejob/test/adapters/async.rb
index d5a61d7684..08eb9658cd 100644
--- a/activejob/test/adapters/async.rb
+++ b/activejob/test/adapters/async.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :async
 ActiveJob::Base.queue_adapter.immediate = true
diff --git a/activejob/test/adapters/backburner.rb b/activejob/test/adapters/backburner.rb
index cfc97432f2..17ba07b802 100644
--- a/activejob/test/adapters/backburner.rb
+++ b/activejob/test/adapters/backburner.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "support/backburner/inline"
 
 ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/adapters/delayed_job.rb b/activejob/test/adapters/delayed_job.rb
index 3aa646555a..98e41c0c36 100644
--- a/activejob/test/adapters/delayed_job.rb
+++ b/activejob/test/adapters/delayed_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :delayed_job
 
 $LOAD_PATH << File.expand_path("../support/delayed_job", __dir__)
diff --git a/activejob/test/adapters/inline.rb b/activejob/test/adapters/inline.rb
index ec3f0940e6..24113dfa5a 100644
--- a/activejob/test/adapters/inline.rb
+++ b/activejob/test/adapters/inline.rb
@@ -1,2 +1 @@
-# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/adapters/qu.rb b/activejob/test/adapters/qu.rb
index f8e7eb624d..b89c504091 100644
--- a/activejob/test/adapters/qu.rb
+++ b/activejob/test/adapters/qu.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "qu-immediate"
 
 ActiveJob::Base.queue_adapter = :qu
diff --git a/activejob/test/adapters/que.rb b/activejob/test/adapters/que.rb
index 0d27bb8fc9..0c49274a4e 100644
--- a/activejob/test/adapters/que.rb
+++ b/activejob/test/adapters/que.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "support/que/inline"
 
 ActiveJob::Base.queue_adapter = :que
diff --git a/activejob/test/adapters/queue_classic.rb b/activejob/test/adapters/queue_classic.rb
index f57057c914..e301a7ca96 100644
--- a/activejob/test/adapters/queue_classic.rb
+++ b/activejob/test/adapters/queue_classic.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 require "support/queue_classic/inline"
 ActiveJob::Base.queue_adapter = :queue_classic
diff --git a/activejob/test/adapters/resque.rb b/activejob/test/adapters/resque.rb
index 6c732c1e33..af7080358d 100644
--- a/activejob/test/adapters/resque.rb
+++ b/activejob/test/adapters/resque.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :resque
 Resque.inline = true
diff --git a/activejob/test/adapters/sidekiq.rb b/activejob/test/adapters/sidekiq.rb
index 6cc64e7684..8036331ef1 100644
--- a/activejob/test/adapters/sidekiq.rb
+++ b/activejob/test/adapters/sidekiq.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 require "sidekiq/testing/inline"
 ActiveJob::Base.queue_adapter = :sidekiq
diff --git a/activejob/test/adapters/sneakers.rb b/activejob/test/adapters/sneakers.rb
index 85f6b74144..159c0d1906 100644
--- a/activejob/test/adapters/sneakers.rb
+++ b/activejob/test/adapters/sneakers.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 require "support/sneakers/inline"
 ActiveJob::Base.queue_adapter = :sneakers
diff --git a/activejob/test/adapters/sucker_punch.rb b/activejob/test/adapters/sucker_punch.rb
index 45b5fa1db2..5661b6ee92 100644
--- a/activejob/test/adapters/sucker_punch.rb
+++ b/activejob/test/adapters/sucker_punch.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 require "sucker_punch/testing/inline"
 ActiveJob::Base.queue_adapter = :sucker_punch
diff --git a/activejob/test/adapters/test.rb b/activejob/test/adapters/test.rb
index 965f7e91a2..7180b38a57 100644
--- a/activejob/test/adapters/test.rb
+++ b/activejob/test/adapters/test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :test
 ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
 ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = true
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
index 764ce3ccbc..caf5d44a5e 100644
--- a/activejob/test/cases/adapter_test.rb
+++ b/activejob/test/cases/adapter_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 
 class AdapterTest < ActiveSupport::TestCase
diff --git a/activejob/test/cases/argument_serialization_test.rb b/activejob/test/cases/argument_serialization_test.rb
index ebd9a4fe41..7934d8e556 100644
--- a/activejob/test/cases/argument_serialization_test.rb
+++ b/activejob/test/cases/argument_serialization_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "active_job/arguments"
 require "models/person"
diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
index fbca367ae9..8d1c9c3058 100644
--- a/activejob/test/cases/callbacks_test.rb
+++ b/activejob/test/cases/callbacks_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/callback_job"
 
diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
index 5f56d47e8e..dbe55f7430 100644
--- a/activejob/test/cases/exceptions_test.rb
+++ b/activejob/test/cases/exceptions_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/retry_job"
 
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index fa8d98ddca..c737557ece 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/gid_job"
 require "jobs/hello_job"
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index 117d9b23a3..d5ca0f385c 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "active_support/log_subscriber/test_helper"
 require "active_support/core_ext/numeric/time"
diff --git a/activejob/test/cases/queue_adapter_test.rb b/activejob/test/cases/queue_adapter_test.rb
index 6061fb2127..8368107bdf 100644
--- a/activejob/test/cases/queue_adapter_test.rb
+++ b/activejob/test/cases/queue_adapter_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 
 module ActiveJob
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
index 8ba4324c46..0247bc111e 100644
--- a/activejob/test/cases/queue_naming_test.rb
+++ b/activejob/test/cases/queue_naming_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "jobs/logging_job"
diff --git a/activejob/test/cases/queue_priority_test.rb b/activejob/test/cases/queue_priority_test.rb
index 416498c270..171fb1e593 100644
--- a/activejob/test/cases/queue_priority_test.rb
+++ b/activejob/test/cases/queue_priority_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 
diff --git a/activejob/test/cases/queuing_test.rb b/activejob/test/cases/queuing_test.rb
index 44f674a2ee..a3ecb15c31 100644
--- a/activejob/test/cases/queuing_test.rb
+++ b/activejob/test/cases/queuing_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "active_support/core_ext/numeric/time"
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
index c2a991cb2d..afb1b48831 100644
--- a/activejob/test/cases/rescue_test.rb
+++ b/activejob/test/cases/rescue_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/rescue_job"
 require "models/person"
diff --git a/activejob/test/cases/test_case_test.rb b/activejob/test/cases/test_case_test.rb
index eb320a98d1..3db2d9dec7 100644
--- a/activejob/test/cases/test_case_test.rb
+++ b/activejob/test/cases/test_case_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "jobs/logging_job"
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 0f8174663e..81e75b4374 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "active_support/core_ext/time"
 require "active_support/core_ext/date"
diff --git a/activejob/test/cases/translation_test.rb b/activejob/test/cases/translation_test.rb
index d6782a38bd..27bfd50985 100644
--- a/activejob/test/cases/translation_test.rb
+++ b/activejob/test/cases/translation_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/translated_hello_job"
 
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index edcf159056..db07ecab7a 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_job"
 require "support/job_buffer"
 
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 72c66d111f..2669c52a1c 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "helper"
 require "jobs/logging_job"
 require "jobs/hello_job"
diff --git a/activejob/test/jobs/application_job.rb b/activejob/test/jobs/application_job.rb
index 32fe70b8e4..a009ace51c 100644
--- a/activejob/test/jobs/application_job.rb
+++ b/activejob/test/jobs/application_job.rb
@@ -1,3 +1,2 @@
-# frozen_string_literal: true
 class ApplicationJob < ActiveJob::Base
 end
diff --git a/activejob/test/jobs/callback_job.rb b/activejob/test/jobs/callback_job.rb
index 7c5b161437..ca2a8e031a 100644
--- a/activejob/test/jobs/callback_job.rb
+++ b/activejob/test/jobs/callback_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class CallbackJob < ActiveJob::Base
   before_perform ->(job) { job.history << "CallbackJob ran before_perform" }
   after_perform ->(job) { job.history << "CallbackJob ran after_perform" }
diff --git a/activejob/test/jobs/gid_job.rb b/activejob/test/jobs/gid_job.rb
index c43e25a796..c7cfa6e7a2 100644
--- a/activejob/test/jobs/gid_job.rb
+++ b/activejob/test/jobs/gid_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class GidJob < ActiveJob::Base
diff --git a/activejob/test/jobs/hello_job.rb b/activejob/test/jobs/hello_job.rb
index 79e1d6a6f4..126fefae00 100644
--- a/activejob/test/jobs/hello_job.rb
+++ b/activejob/test/jobs/hello_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class HelloJob < ActiveJob::Base
diff --git a/activejob/test/jobs/inherited_job.rb b/activejob/test/jobs/inherited_job.rb
index 58b6582154..60fca66f88 100644
--- a/activejob/test/jobs/inherited_job.rb
+++ b/activejob/test/jobs/inherited_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "application_job"
 
 class InheritedJob < ApplicationJob
diff --git a/activejob/test/jobs/kwargs_job.rb b/activejob/test/jobs/kwargs_job.rb
index ccd9811595..9f9d809673 100644
--- a/activejob/test/jobs/kwargs_job.rb
+++ b/activejob/test/jobs/kwargs_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class KwargsJob < ActiveJob::Base
diff --git a/activejob/test/jobs/logging_job.rb b/activejob/test/jobs/logging_job.rb
index 1a47601fde..119b32fa67 100644
--- a/activejob/test/jobs/logging_job.rb
+++ b/activejob/test/jobs/logging_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class LoggingJob < ActiveJob::Base
   def perform(dummy)
     logger.info "Dummy, here is it: #{dummy}"
diff --git a/activejob/test/jobs/nested_job.rb b/activejob/test/jobs/nested_job.rb
index 891a2f952e..21b7692cd1 100644
--- a/activejob/test/jobs/nested_job.rb
+++ b/activejob/test/jobs/nested_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class NestedJob < ActiveJob::Base
   def perform
     LoggingJob.perform_later "NestedJob"
diff --git a/activejob/test/jobs/overridden_logging_job.rb b/activejob/test/jobs/overridden_logging_job.rb
index 808d6e30e6..2b17a65142 100644
--- a/activejob/test/jobs/overridden_logging_job.rb
+++ b/activejob/test/jobs/overridden_logging_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class OverriddenLoggingJob < ActiveJob::Base
   def perform(dummy)
     logger.info "Dummy, here is it: #{dummy}"
diff --git a/activejob/test/jobs/provider_jid_job.rb b/activejob/test/jobs/provider_jid_job.rb
index 71ed23e9bb..0c8ba040f5 100644
--- a/activejob/test/jobs/provider_jid_job.rb
+++ b/activejob/test/jobs/provider_jid_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class ProviderJidJob < ActiveJob::Base
diff --git a/activejob/test/jobs/queue_adapter_job.rb b/activejob/test/jobs/queue_adapter_job.rb
index 7058ab2087..160dfd74ec 100644
--- a/activejob/test/jobs/queue_adapter_job.rb
+++ b/activejob/test/jobs/queue_adapter_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class QueueAdapterJob < ActiveJob::Base
   self.queue_adapter = :inline
 end
diff --git a/activejob/test/jobs/queue_as_job.rb b/activejob/test/jobs/queue_as_job.rb
index ab3075aa77..7dc318e736 100644
--- a/activejob/test/jobs/queue_as_job.rb
+++ b/activejob/test/jobs/queue_as_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class QueueAsJob < ActiveJob::Base
diff --git a/activejob/test/jobs/rescue_job.rb b/activejob/test/jobs/rescue_job.rb
index fd78820bfe..62add4271a 100644
--- a/activejob/test/jobs/rescue_job.rb
+++ b/activejob/test/jobs/rescue_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class RescueJob < ActiveJob::Base
diff --git a/activejob/test/jobs/retry_job.rb b/activejob/test/jobs/retry_job.rb
index b121296441..c02febc50c 100644
--- a/activejob/test/jobs/retry_job.rb
+++ b/activejob/test/jobs/retry_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 require "active_support/core_ext/integer/inflections"
 
diff --git a/activejob/test/jobs/translated_hello_job.rb b/activejob/test/jobs/translated_hello_job.rb
index 67ddca2f41..56e9f147b9 100644
--- a/activejob/test/jobs/translated_hello_job.rb
+++ b/activejob/test/jobs/translated_hello_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class TranslatedHelloJob < ActiveJob::Base
diff --git a/activejob/test/models/person.rb b/activejob/test/models/person.rb
index bcd1018782..b5d68ad9c1 100644
--- a/activejob/test/models/person.rb
+++ b/activejob/test/models/person.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class Person
   class RecordNotFound < StandardError; end
 
diff --git a/activejob/test/support/backburner/inline.rb b/activejob/test/support/backburner/inline.rb
index 304f9c781c..9758332b6f 100644
--- a/activejob/test/support/backburner/inline.rb
+++ b/activejob/test/support/backburner/inline.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "backburner"
 
 Backburner::Worker.class_eval do
diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb
index ed3b252042..68288c062b 100644
--- a/activejob/test/support/delayed_job/delayed/backend/test.rb
+++ b/activejob/test/support/delayed_job/delayed/backend/test.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 #copied from https://github.com/collectiveidea/delayed_job/blob/master/spec/delayed/backend/test.rb
 require "ostruct"
 
diff --git a/activejob/test/support/integration/adapters/async.rb b/activejob/test/support/integration/adapters/async.rb
index 19aea8472e..44ab98437a 100644
--- a/activejob/test/support/integration/adapters/async.rb
+++ b/activejob/test/support/integration/adapters/async.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module AsyncJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :async
diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb
index fd1e7697c5..2e194933a1 100644
--- a/activejob/test/support/integration/adapters/backburner.rb
+++ b/activejob/test/support/integration/adapters/backburner.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module BackburnerJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/support/integration/adapters/delayed_job.rb b/activejob/test/support/integration/adapters/delayed_job.rb
index 73e1a04e45..2adbbcd88f 100644
--- a/activejob/test/support/integration/adapters/delayed_job.rb
+++ b/activejob/test/support/integration/adapters/delayed_job.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "delayed_job"
 require "delayed_job_active_record"
 
diff --git a/activejob/test/support/integration/adapters/inline.rb b/activejob/test/support/integration/adapters/inline.rb
index c669793dba..e06b34c976 100644
--- a/activejob/test/support/integration/adapters/inline.rb
+++ b/activejob/test/support/integration/adapters/inline.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module InlineJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
index b2f63d8f94..71819f5a55 100644
--- a/activejob/test/support/integration/adapters/qu.rb
+++ b/activejob/test/support/integration/adapters/qu.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module QuJobsManager
   def setup
     require "qu-rails"
diff --git a/activejob/test/support/integration/adapters/que.rb b/activejob/test/support/integration/adapters/que.rb
index cf1160d2bc..20faee3427 100644
--- a/activejob/test/support/integration/adapters/que.rb
+++ b/activejob/test/support/integration/adapters/que.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module QueJobsManager
   def setup
     require "sequel"
diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb
index 7f1308c5d3..369693e947 100644
--- a/activejob/test/support/integration/adapters/queue_classic.rb
+++ b/activejob/test/support/integration/adapters/queue_classic.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module QueueClassicJobsManager
   def setup
     ENV["QC_DATABASE_URL"] ||= "postgres:///active_jobs_qc_int_test"
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb
index ef2dd75687..a21a1786c9 100644
--- a/activejob/test/support/integration/adapters/resque.rb
+++ b/activejob/test/support/integration/adapters/resque.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module ResqueJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :resque
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index 8c90410e76..bbb575f6da 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "sidekiq/api"
 
 require "sidekiq/testing"
diff --git a/activejob/test/support/integration/adapters/sneakers.rb b/activejob/test/support/integration/adapters/sneakers.rb
index dc42501ff3..1c8dfaca59 100644
--- a/activejob/test/support/integration/adapters/sneakers.rb
+++ b/activejob/test/support/integration/adapters/sneakers.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "sneakers/runner"
 require "sneakers/publisher"
 require "timeout"
diff --git a/activejob/test/support/integration/adapters/sucker_punch.rb b/activejob/test/support/integration/adapters/sucker_punch.rb
index e528f24261..9c0d66b469 100644
--- a/activejob/test/support/integration/adapters/sucker_punch.rb
+++ b/activejob/test/support/integration/adapters/sucker_punch.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module SuckerPunchJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :sucker_punch
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb
index a054ecea08..14fe3c9adc 100644
--- a/activejob/test/support/integration/dummy_app_template.rb
+++ b/activejob/test/support/integration/dummy_app_template.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 if ENV["AJ_ADAPTER"] == "delayed_job"
   generate "delayed_job:active_record", "--quiet"
 end
diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb
index c0aa14c4c2..545b62752e 100644
--- a/activejob/test/support/integration/helper.rb
+++ b/activejob/test/support/integration/helper.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 puts "\n\n*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n"
 
 ENV["RAILS_ENV"] = "test"
diff --git a/activejob/test/support/integration/jobs_manager.rb b/activejob/test/support/integration/jobs_manager.rb
index 1cfbd60dc4..488756437b 100644
--- a/activejob/test/support/integration/jobs_manager.rb
+++ b/activejob/test/support/integration/jobs_manager.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 class JobsManager
   @@managers = {}
   attr :adapter_name
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb
index add719187c..41bf9c89d1 100644
--- a/activejob/test/support/integration/test_case_helpers.rb
+++ b/activejob/test/support/integration/test_case_helpers.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "active_support/core_ext/string/inflections"
 require "support/integration/jobs_manager"
 
diff --git a/activejob/test/support/job_buffer.rb b/activejob/test/support/job_buffer.rb
index 3146d06d54..620cb5288d 100644
--- a/activejob/test/support/job_buffer.rb
+++ b/activejob/test/support/job_buffer.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 module JobBuffer
   class << self
     def clear
diff --git a/activejob/test/support/que/inline.rb b/activejob/test/support/que/inline.rb
index e204f8154a..55eb0d01ef 100644
--- a/activejob/test/support/que/inline.rb
+++ b/activejob/test/support/que/inline.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "que"
 
 Que::Job.class_eval do
diff --git a/activejob/test/support/queue_classic/inline.rb b/activejob/test/support/queue_classic/inline.rb
index 955469e5a8..dcd834ecce 100644
--- a/activejob/test/support/queue_classic/inline.rb
+++ b/activejob/test/support/queue_classic/inline.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "queue_classic"
 
 module QC
diff --git a/activejob/test/support/sneakers/inline.rb b/activejob/test/support/sneakers/inline.rb
index 46882870d5..cf102ae5c2 100644
--- a/activejob/test/support/sneakers/inline.rb
+++ b/activejob/test/support/sneakers/inline.rb
@@ -1,4 +1,3 @@
-# frozen_string_literal: true
 require "sneakers"
 
 module Sneakers
-- 
cgit v1.2.3


From 14ece5e4292053e7a40e9bd80c447745f721e217 Mon Sep 17 00:00:00 2001
From: Kir Shatrov <shatrov@me.com>
Date: Sun, 9 Jul 2017 20:49:52 +0300
Subject: Use frozen-string-literal in ActiveJob

---
 activejob/test/adapters/async.rb                             | 1 +
 activejob/test/adapters/backburner.rb                        | 1 +
 activejob/test/adapters/delayed_job.rb                       | 1 +
 activejob/test/adapters/inline.rb                            | 1 +
 activejob/test/adapters/qu.rb                                | 1 +
 activejob/test/adapters/que.rb                               | 1 +
 activejob/test/adapters/queue_classic.rb                     | 1 +
 activejob/test/adapters/resque.rb                            | 1 +
 activejob/test/adapters/sidekiq.rb                           | 1 +
 activejob/test/adapters/sneakers.rb                          | 1 +
 activejob/test/adapters/sucker_punch.rb                      | 1 +
 activejob/test/adapters/test.rb                              | 1 +
 activejob/test/cases/adapter_test.rb                         | 1 +
 activejob/test/cases/argument_serialization_test.rb          | 1 +
 activejob/test/cases/callbacks_test.rb                       | 1 +
 activejob/test/cases/exceptions_test.rb                      | 1 +
 activejob/test/cases/job_serialization_test.rb               | 1 +
 activejob/test/cases/logging_test.rb                         | 1 +
 activejob/test/cases/queue_adapter_test.rb                   | 1 +
 activejob/test/cases/queue_naming_test.rb                    | 1 +
 activejob/test/cases/queue_priority_test.rb                  | 1 +
 activejob/test/cases/queuing_test.rb                         | 1 +
 activejob/test/cases/rescue_test.rb                          | 1 +
 activejob/test/cases/test_case_test.rb                       | 1 +
 activejob/test/cases/test_helper_test.rb                     | 1 +
 activejob/test/cases/translation_test.rb                     | 1 +
 activejob/test/helper.rb                                     | 1 +
 activejob/test/integration/queuing_test.rb                   | 1 +
 activejob/test/jobs/application_job.rb                       | 1 +
 activejob/test/jobs/callback_job.rb                          | 1 +
 activejob/test/jobs/gid_job.rb                               | 1 +
 activejob/test/jobs/hello_job.rb                             | 1 +
 activejob/test/jobs/inherited_job.rb                         | 1 +
 activejob/test/jobs/kwargs_job.rb                            | 1 +
 activejob/test/jobs/logging_job.rb                           | 1 +
 activejob/test/jobs/nested_job.rb                            | 1 +
 activejob/test/jobs/overridden_logging_job.rb                | 1 +
 activejob/test/jobs/provider_jid_job.rb                      | 1 +
 activejob/test/jobs/queue_adapter_job.rb                     | 1 +
 activejob/test/jobs/queue_as_job.rb                          | 1 +
 activejob/test/jobs/rescue_job.rb                            | 1 +
 activejob/test/jobs/retry_job.rb                             | 1 +
 activejob/test/jobs/translated_hello_job.rb                  | 1 +
 activejob/test/models/person.rb                              | 1 +
 activejob/test/support/backburner/inline.rb                  | 1 +
 activejob/test/support/delayed_job/delayed/backend/test.rb   | 1 +
 activejob/test/support/integration/adapters/async.rb         | 1 +
 activejob/test/support/integration/adapters/backburner.rb    | 1 +
 activejob/test/support/integration/adapters/delayed_job.rb   | 1 +
 activejob/test/support/integration/adapters/inline.rb        | 1 +
 activejob/test/support/integration/adapters/qu.rb            | 1 +
 activejob/test/support/integration/adapters/que.rb           | 1 +
 activejob/test/support/integration/adapters/queue_classic.rb | 1 +
 activejob/test/support/integration/adapters/resque.rb        | 1 +
 activejob/test/support/integration/adapters/sidekiq.rb       | 1 +
 activejob/test/support/integration/adapters/sneakers.rb      | 1 +
 activejob/test/support/integration/adapters/sucker_punch.rb  | 1 +
 activejob/test/support/integration/dummy_app_template.rb     | 1 +
 activejob/test/support/integration/helper.rb                 | 1 +
 activejob/test/support/integration/jobs_manager.rb           | 1 +
 activejob/test/support/integration/test_case_helpers.rb      | 1 +
 activejob/test/support/job_buffer.rb                         | 1 +
 activejob/test/support/que/inline.rb                         | 1 +
 activejob/test/support/queue_classic/inline.rb               | 1 +
 activejob/test/support/sneakers/inline.rb                    | 1 +
 65 files changed, 65 insertions(+)

(limited to 'activejob/test')

diff --git a/activejob/test/adapters/async.rb b/activejob/test/adapters/async.rb
index 08eb9658cd..d5a61d7684 100644
--- a/activejob/test/adapters/async.rb
+++ b/activejob/test/adapters/async.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :async
 ActiveJob::Base.queue_adapter.immediate = true
diff --git a/activejob/test/adapters/backburner.rb b/activejob/test/adapters/backburner.rb
index 17ba07b802..cfc97432f2 100644
--- a/activejob/test/adapters/backburner.rb
+++ b/activejob/test/adapters/backburner.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "support/backburner/inline"
 
 ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/adapters/delayed_job.rb b/activejob/test/adapters/delayed_job.rb
index 98e41c0c36..3aa646555a 100644
--- a/activejob/test/adapters/delayed_job.rb
+++ b/activejob/test/adapters/delayed_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :delayed_job
 
 $LOAD_PATH << File.expand_path("../support/delayed_job", __dir__)
diff --git a/activejob/test/adapters/inline.rb b/activejob/test/adapters/inline.rb
index 24113dfa5a..ec3f0940e6 100644
--- a/activejob/test/adapters/inline.rb
+++ b/activejob/test/adapters/inline.rb
@@ -1 +1,2 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/adapters/qu.rb b/activejob/test/adapters/qu.rb
index b89c504091..f8e7eb624d 100644
--- a/activejob/test/adapters/qu.rb
+++ b/activejob/test/adapters/qu.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "qu-immediate"
 
 ActiveJob::Base.queue_adapter = :qu
diff --git a/activejob/test/adapters/que.rb b/activejob/test/adapters/que.rb
index 0c49274a4e..0d27bb8fc9 100644
--- a/activejob/test/adapters/que.rb
+++ b/activejob/test/adapters/que.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "support/que/inline"
 
 ActiveJob::Base.queue_adapter = :que
diff --git a/activejob/test/adapters/queue_classic.rb b/activejob/test/adapters/queue_classic.rb
index e301a7ca96..f57057c914 100644
--- a/activejob/test/adapters/queue_classic.rb
+++ b/activejob/test/adapters/queue_classic.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "support/queue_classic/inline"
 ActiveJob::Base.queue_adapter = :queue_classic
diff --git a/activejob/test/adapters/resque.rb b/activejob/test/adapters/resque.rb
index af7080358d..6c732c1e33 100644
--- a/activejob/test/adapters/resque.rb
+++ b/activejob/test/adapters/resque.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :resque
 Resque.inline = true
diff --git a/activejob/test/adapters/sidekiq.rb b/activejob/test/adapters/sidekiq.rb
index 8036331ef1..6cc64e7684 100644
--- a/activejob/test/adapters/sidekiq.rb
+++ b/activejob/test/adapters/sidekiq.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "sidekiq/testing/inline"
 ActiveJob::Base.queue_adapter = :sidekiq
diff --git a/activejob/test/adapters/sneakers.rb b/activejob/test/adapters/sneakers.rb
index 159c0d1906..85f6b74144 100644
--- a/activejob/test/adapters/sneakers.rb
+++ b/activejob/test/adapters/sneakers.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "support/sneakers/inline"
 ActiveJob::Base.queue_adapter = :sneakers
diff --git a/activejob/test/adapters/sucker_punch.rb b/activejob/test/adapters/sucker_punch.rb
index 5661b6ee92..45b5fa1db2 100644
--- a/activejob/test/adapters/sucker_punch.rb
+++ b/activejob/test/adapters/sucker_punch.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 require "sucker_punch/testing/inline"
 ActiveJob::Base.queue_adapter = :sucker_punch
diff --git a/activejob/test/adapters/test.rb b/activejob/test/adapters/test.rb
index 7180b38a57..965f7e91a2 100644
--- a/activejob/test/adapters/test.rb
+++ b/activejob/test/adapters/test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ActiveJob::Base.queue_adapter = :test
 ActiveJob::Base.queue_adapter.perform_enqueued_jobs = true
 ActiveJob::Base.queue_adapter.perform_enqueued_at_jobs = true
diff --git a/activejob/test/cases/adapter_test.rb b/activejob/test/cases/adapter_test.rb
index caf5d44a5e..764ce3ccbc 100644
--- a/activejob/test/cases/adapter_test.rb
+++ b/activejob/test/cases/adapter_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 
 class AdapterTest < ActiveSupport::TestCase
diff --git a/activejob/test/cases/argument_serialization_test.rb b/activejob/test/cases/argument_serialization_test.rb
index 7934d8e556..ebd9a4fe41 100644
--- a/activejob/test/cases/argument_serialization_test.rb
+++ b/activejob/test/cases/argument_serialization_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "active_job/arguments"
 require "models/person"
diff --git a/activejob/test/cases/callbacks_test.rb b/activejob/test/cases/callbacks_test.rb
index 8d1c9c3058..fbca367ae9 100644
--- a/activejob/test/cases/callbacks_test.rb
+++ b/activejob/test/cases/callbacks_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/callback_job"
 
diff --git a/activejob/test/cases/exceptions_test.rb b/activejob/test/cases/exceptions_test.rb
index dbe55f7430..5f56d47e8e 100644
--- a/activejob/test/cases/exceptions_test.rb
+++ b/activejob/test/cases/exceptions_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/retry_job"
 
diff --git a/activejob/test/cases/job_serialization_test.rb b/activejob/test/cases/job_serialization_test.rb
index c737557ece..fa8d98ddca 100644
--- a/activejob/test/cases/job_serialization_test.rb
+++ b/activejob/test/cases/job_serialization_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/gid_job"
 require "jobs/hello_job"
diff --git a/activejob/test/cases/logging_test.rb b/activejob/test/cases/logging_test.rb
index d5ca0f385c..117d9b23a3 100644
--- a/activejob/test/cases/logging_test.rb
+++ b/activejob/test/cases/logging_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "active_support/log_subscriber/test_helper"
 require "active_support/core_ext/numeric/time"
diff --git a/activejob/test/cases/queue_adapter_test.rb b/activejob/test/cases/queue_adapter_test.rb
index 8368107bdf..6061fb2127 100644
--- a/activejob/test/cases/queue_adapter_test.rb
+++ b/activejob/test/cases/queue_adapter_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 
 module ActiveJob
diff --git a/activejob/test/cases/queue_naming_test.rb b/activejob/test/cases/queue_naming_test.rb
index 0247bc111e..8ba4324c46 100644
--- a/activejob/test/cases/queue_naming_test.rb
+++ b/activejob/test/cases/queue_naming_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "jobs/logging_job"
diff --git a/activejob/test/cases/queue_priority_test.rb b/activejob/test/cases/queue_priority_test.rb
index 171fb1e593..416498c270 100644
--- a/activejob/test/cases/queue_priority_test.rb
+++ b/activejob/test/cases/queue_priority_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 
diff --git a/activejob/test/cases/queuing_test.rb b/activejob/test/cases/queuing_test.rb
index a3ecb15c31..44f674a2ee 100644
--- a/activejob/test/cases/queuing_test.rb
+++ b/activejob/test/cases/queuing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "active_support/core_ext/numeric/time"
diff --git a/activejob/test/cases/rescue_test.rb b/activejob/test/cases/rescue_test.rb
index afb1b48831..c2a991cb2d 100644
--- a/activejob/test/cases/rescue_test.rb
+++ b/activejob/test/cases/rescue_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/rescue_job"
 require "models/person"
diff --git a/activejob/test/cases/test_case_test.rb b/activejob/test/cases/test_case_test.rb
index 3db2d9dec7..eb320a98d1 100644
--- a/activejob/test/cases/test_case_test.rb
+++ b/activejob/test/cases/test_case_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/hello_job"
 require "jobs/logging_job"
diff --git a/activejob/test/cases/test_helper_test.rb b/activejob/test/cases/test_helper_test.rb
index 81e75b4374..0f8174663e 100644
--- a/activejob/test/cases/test_helper_test.rb
+++ b/activejob/test/cases/test_helper_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "active_support/core_ext/time"
 require "active_support/core_ext/date"
diff --git a/activejob/test/cases/translation_test.rb b/activejob/test/cases/translation_test.rb
index 27bfd50985..d6782a38bd 100644
--- a/activejob/test/cases/translation_test.rb
+++ b/activejob/test/cases/translation_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/translated_hello_job"
 
diff --git a/activejob/test/helper.rb b/activejob/test/helper.rb
index db07ecab7a..edcf159056 100644
--- a/activejob/test/helper.rb
+++ b/activejob/test/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_job"
 require "support/job_buffer"
 
diff --git a/activejob/test/integration/queuing_test.rb b/activejob/test/integration/queuing_test.rb
index 2669c52a1c..72c66d111f 100644
--- a/activejob/test/integration/queuing_test.rb
+++ b/activejob/test/integration/queuing_test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "helper"
 require "jobs/logging_job"
 require "jobs/hello_job"
diff --git a/activejob/test/jobs/application_job.rb b/activejob/test/jobs/application_job.rb
index a009ace51c..32fe70b8e4 100644
--- a/activejob/test/jobs/application_job.rb
+++ b/activejob/test/jobs/application_job.rb
@@ -1,2 +1,3 @@
+# frozen_string_literal: true
 class ApplicationJob < ActiveJob::Base
 end
diff --git a/activejob/test/jobs/callback_job.rb b/activejob/test/jobs/callback_job.rb
index ca2a8e031a..7c5b161437 100644
--- a/activejob/test/jobs/callback_job.rb
+++ b/activejob/test/jobs/callback_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class CallbackJob < ActiveJob::Base
   before_perform ->(job) { job.history << "CallbackJob ran before_perform" }
   after_perform ->(job) { job.history << "CallbackJob ran after_perform" }
diff --git a/activejob/test/jobs/gid_job.rb b/activejob/test/jobs/gid_job.rb
index c7cfa6e7a2..c43e25a796 100644
--- a/activejob/test/jobs/gid_job.rb
+++ b/activejob/test/jobs/gid_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class GidJob < ActiveJob::Base
diff --git a/activejob/test/jobs/hello_job.rb b/activejob/test/jobs/hello_job.rb
index 126fefae00..79e1d6a6f4 100644
--- a/activejob/test/jobs/hello_job.rb
+++ b/activejob/test/jobs/hello_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class HelloJob < ActiveJob::Base
diff --git a/activejob/test/jobs/inherited_job.rb b/activejob/test/jobs/inherited_job.rb
index 60fca66f88..58b6582154 100644
--- a/activejob/test/jobs/inherited_job.rb
+++ b/activejob/test/jobs/inherited_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "application_job"
 
 class InheritedJob < ApplicationJob
diff --git a/activejob/test/jobs/kwargs_job.rb b/activejob/test/jobs/kwargs_job.rb
index 9f9d809673..ccd9811595 100644
--- a/activejob/test/jobs/kwargs_job.rb
+++ b/activejob/test/jobs/kwargs_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class KwargsJob < ActiveJob::Base
diff --git a/activejob/test/jobs/logging_job.rb b/activejob/test/jobs/logging_job.rb
index 119b32fa67..1a47601fde 100644
--- a/activejob/test/jobs/logging_job.rb
+++ b/activejob/test/jobs/logging_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class LoggingJob < ActiveJob::Base
   def perform(dummy)
     logger.info "Dummy, here is it: #{dummy}"
diff --git a/activejob/test/jobs/nested_job.rb b/activejob/test/jobs/nested_job.rb
index 21b7692cd1..891a2f952e 100644
--- a/activejob/test/jobs/nested_job.rb
+++ b/activejob/test/jobs/nested_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class NestedJob < ActiveJob::Base
   def perform
     LoggingJob.perform_later "NestedJob"
diff --git a/activejob/test/jobs/overridden_logging_job.rb b/activejob/test/jobs/overridden_logging_job.rb
index 2b17a65142..808d6e30e6 100644
--- a/activejob/test/jobs/overridden_logging_job.rb
+++ b/activejob/test/jobs/overridden_logging_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class OverriddenLoggingJob < ActiveJob::Base
   def perform(dummy)
     logger.info "Dummy, here is it: #{dummy}"
diff --git a/activejob/test/jobs/provider_jid_job.rb b/activejob/test/jobs/provider_jid_job.rb
index 0c8ba040f5..71ed23e9bb 100644
--- a/activejob/test/jobs/provider_jid_job.rb
+++ b/activejob/test/jobs/provider_jid_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class ProviderJidJob < ActiveJob::Base
diff --git a/activejob/test/jobs/queue_adapter_job.rb b/activejob/test/jobs/queue_adapter_job.rb
index 160dfd74ec..7058ab2087 100644
--- a/activejob/test/jobs/queue_adapter_job.rb
+++ b/activejob/test/jobs/queue_adapter_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class QueueAdapterJob < ActiveJob::Base
   self.queue_adapter = :inline
 end
diff --git a/activejob/test/jobs/queue_as_job.rb b/activejob/test/jobs/queue_as_job.rb
index 7dc318e736..ab3075aa77 100644
--- a/activejob/test/jobs/queue_as_job.rb
+++ b/activejob/test/jobs/queue_as_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class QueueAsJob < ActiveJob::Base
diff --git a/activejob/test/jobs/rescue_job.rb b/activejob/test/jobs/rescue_job.rb
index 62add4271a..fd78820bfe 100644
--- a/activejob/test/jobs/rescue_job.rb
+++ b/activejob/test/jobs/rescue_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class RescueJob < ActiveJob::Base
diff --git a/activejob/test/jobs/retry_job.rb b/activejob/test/jobs/retry_job.rb
index c02febc50c..b121296441 100644
--- a/activejob/test/jobs/retry_job.rb
+++ b/activejob/test/jobs/retry_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 require "active_support/core_ext/integer/inflections"
 
diff --git a/activejob/test/jobs/translated_hello_job.rb b/activejob/test/jobs/translated_hello_job.rb
index 56e9f147b9..67ddca2f41 100644
--- a/activejob/test/jobs/translated_hello_job.rb
+++ b/activejob/test/jobs/translated_hello_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "../support/job_buffer"
 
 class TranslatedHelloJob < ActiveJob::Base
diff --git a/activejob/test/models/person.rb b/activejob/test/models/person.rb
index b5d68ad9c1..bcd1018782 100644
--- a/activejob/test/models/person.rb
+++ b/activejob/test/models/person.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class Person
   class RecordNotFound < StandardError; end
 
diff --git a/activejob/test/support/backburner/inline.rb b/activejob/test/support/backburner/inline.rb
index 9758332b6f..304f9c781c 100644
--- a/activejob/test/support/backburner/inline.rb
+++ b/activejob/test/support/backburner/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "backburner"
 
 Backburner::Worker.class_eval do
diff --git a/activejob/test/support/delayed_job/delayed/backend/test.rb b/activejob/test/support/delayed_job/delayed/backend/test.rb
index 68288c062b..ed3b252042 100644
--- a/activejob/test/support/delayed_job/delayed/backend/test.rb
+++ b/activejob/test/support/delayed_job/delayed/backend/test.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 #copied from https://github.com/collectiveidea/delayed_job/blob/master/spec/delayed/backend/test.rb
 require "ostruct"
 
diff --git a/activejob/test/support/integration/adapters/async.rb b/activejob/test/support/integration/adapters/async.rb
index 44ab98437a..19aea8472e 100644
--- a/activejob/test/support/integration/adapters/async.rb
+++ b/activejob/test/support/integration/adapters/async.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module AsyncJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :async
diff --git a/activejob/test/support/integration/adapters/backburner.rb b/activejob/test/support/integration/adapters/backburner.rb
index 2e194933a1..fd1e7697c5 100644
--- a/activejob/test/support/integration/adapters/backburner.rb
+++ b/activejob/test/support/integration/adapters/backburner.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module BackburnerJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :backburner
diff --git a/activejob/test/support/integration/adapters/delayed_job.rb b/activejob/test/support/integration/adapters/delayed_job.rb
index 2adbbcd88f..73e1a04e45 100644
--- a/activejob/test/support/integration/adapters/delayed_job.rb
+++ b/activejob/test/support/integration/adapters/delayed_job.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "delayed_job"
 require "delayed_job_active_record"
 
diff --git a/activejob/test/support/integration/adapters/inline.rb b/activejob/test/support/integration/adapters/inline.rb
index e06b34c976..c669793dba 100644
--- a/activejob/test/support/integration/adapters/inline.rb
+++ b/activejob/test/support/integration/adapters/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module InlineJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :inline
diff --git a/activejob/test/support/integration/adapters/qu.rb b/activejob/test/support/integration/adapters/qu.rb
index 71819f5a55..b2f63d8f94 100644
--- a/activejob/test/support/integration/adapters/qu.rb
+++ b/activejob/test/support/integration/adapters/qu.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QuJobsManager
   def setup
     require "qu-rails"
diff --git a/activejob/test/support/integration/adapters/que.rb b/activejob/test/support/integration/adapters/que.rb
index 20faee3427..cf1160d2bc 100644
--- a/activejob/test/support/integration/adapters/que.rb
+++ b/activejob/test/support/integration/adapters/que.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueJobsManager
   def setup
     require "sequel"
diff --git a/activejob/test/support/integration/adapters/queue_classic.rb b/activejob/test/support/integration/adapters/queue_classic.rb
index 369693e947..7f1308c5d3 100644
--- a/activejob/test/support/integration/adapters/queue_classic.rb
+++ b/activejob/test/support/integration/adapters/queue_classic.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module QueueClassicJobsManager
   def setup
     ENV["QC_DATABASE_URL"] ||= "postgres:///active_jobs_qc_int_test"
diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb
index a21a1786c9..ef2dd75687 100644
--- a/activejob/test/support/integration/adapters/resque.rb
+++ b/activejob/test/support/integration/adapters/resque.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module ResqueJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :resque
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index bbb575f6da..8c90410e76 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sidekiq/api"
 
 require "sidekiq/testing"
diff --git a/activejob/test/support/integration/adapters/sneakers.rb b/activejob/test/support/integration/adapters/sneakers.rb
index 1c8dfaca59..dc42501ff3 100644
--- a/activejob/test/support/integration/adapters/sneakers.rb
+++ b/activejob/test/support/integration/adapters/sneakers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sneakers/runner"
 require "sneakers/publisher"
 require "timeout"
diff --git a/activejob/test/support/integration/adapters/sucker_punch.rb b/activejob/test/support/integration/adapters/sucker_punch.rb
index 9c0d66b469..e528f24261 100644
--- a/activejob/test/support/integration/adapters/sucker_punch.rb
+++ b/activejob/test/support/integration/adapters/sucker_punch.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SuckerPunchJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :sucker_punch
diff --git a/activejob/test/support/integration/dummy_app_template.rb b/activejob/test/support/integration/dummy_app_template.rb
index 14fe3c9adc..a054ecea08 100644
--- a/activejob/test/support/integration/dummy_app_template.rb
+++ b/activejob/test/support/integration/dummy_app_template.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 if ENV["AJ_ADAPTER"] == "delayed_job"
   generate "delayed_job:active_record", "--quiet"
 end
diff --git a/activejob/test/support/integration/helper.rb b/activejob/test/support/integration/helper.rb
index 545b62752e..c0aa14c4c2 100644
--- a/activejob/test/support/integration/helper.rb
+++ b/activejob/test/support/integration/helper.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 puts "\n\n*** rake aj:integration:#{ENV['AJ_ADAPTER']} ***\n"
 
 ENV["RAILS_ENV"] = "test"
diff --git a/activejob/test/support/integration/jobs_manager.rb b/activejob/test/support/integration/jobs_manager.rb
index 488756437b..1cfbd60dc4 100644
--- a/activejob/test/support/integration/jobs_manager.rb
+++ b/activejob/test/support/integration/jobs_manager.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class JobsManager
   @@managers = {}
   attr :adapter_name
diff --git a/activejob/test/support/integration/test_case_helpers.rb b/activejob/test/support/integration/test_case_helpers.rb
index 41bf9c89d1..add719187c 100644
--- a/activejob/test/support/integration/test_case_helpers.rb
+++ b/activejob/test/support/integration/test_case_helpers.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "active_support/core_ext/string/inflections"
 require "support/integration/jobs_manager"
 
diff --git a/activejob/test/support/job_buffer.rb b/activejob/test/support/job_buffer.rb
index 620cb5288d..3146d06d54 100644
--- a/activejob/test/support/job_buffer.rb
+++ b/activejob/test/support/job_buffer.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module JobBuffer
   class << self
     def clear
diff --git a/activejob/test/support/que/inline.rb b/activejob/test/support/que/inline.rb
index 55eb0d01ef..e204f8154a 100644
--- a/activejob/test/support/que/inline.rb
+++ b/activejob/test/support/que/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "que"
 
 Que::Job.class_eval do
diff --git a/activejob/test/support/queue_classic/inline.rb b/activejob/test/support/queue_classic/inline.rb
index dcd834ecce..955469e5a8 100644
--- a/activejob/test/support/queue_classic/inline.rb
+++ b/activejob/test/support/queue_classic/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "queue_classic"
 
 module QC
diff --git a/activejob/test/support/sneakers/inline.rb b/activejob/test/support/sneakers/inline.rb
index cf102ae5c2..46882870d5 100644
--- a/activejob/test/support/sneakers/inline.rb
+++ b/activejob/test/support/sneakers/inline.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "sneakers"
 
 module Sneakers
-- 
cgit v1.2.3


From 46725b33a90ce4a69e88b5c734703f9d7f4cf669 Mon Sep 17 00:00:00 2001
From: "yuuji.yaginuma" <yuuji.yaginuma@gmail.com>
Date: Mon, 10 Jul 2017 07:42:17 +0900
Subject: Make sidekiq and resque integration tests work in CI

Since f55ecc6, the integration test of sidekiq and resque is not working
in CI.
https://travis-ci.org/rails/rails/jobs/251783876

Because f55ecc6 required a password to access redis.
Therefore, handling by passing passwords when connecting to redis.
---
 activejob/test/support/integration/adapters/resque.rb  | 2 +-
 activejob/test/support/integration/adapters/sidekiq.rb | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'activejob/test')

diff --git a/activejob/test/support/integration/adapters/resque.rb b/activejob/test/support/integration/adapters/resque.rb
index ef2dd75687..5d142d324d 100644
--- a/activejob/test/support/integration/adapters/resque.rb
+++ b/activejob/test/support/integration/adapters/resque.rb
@@ -2,7 +2,7 @@
 module ResqueJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :resque
-    Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.connect(url: "redis://127.0.0.1:6379/12", thread_safe: true)
+    Resque.redis = Redis::Namespace.new "active_jobs_int_test", redis: Redis.connect(url: "redis://:password@127.0.0.1:6379/12", thread_safe: true)
     Resque.logger = Rails.logger
     unless can_run?
       puts "Cannot run integration tests for resque. To be able to run integration tests for resque you need to install and start redis.\n"
diff --git a/activejob/test/support/integration/adapters/sidekiq.rb b/activejob/test/support/integration/adapters/sidekiq.rb
index 8c90410e76..253cbd550b 100644
--- a/activejob/test/support/integration/adapters/sidekiq.rb
+++ b/activejob/test/support/integration/adapters/sidekiq.rb
@@ -4,6 +4,14 @@ require "sidekiq/api"
 require "sidekiq/testing"
 Sidekiq::Testing.disable!
 
+Sidekiq.configure_server do |config|
+  config.redis = { url: "redis://:password@127.0.0.1:6379/12" }
+end
+
+Sidekiq.configure_client do |config|
+  config.redis = { url: "redis://:password@127.0.0.1:6379/12" }
+end
+
 module SidekiqJobsManager
   def setup
     ActiveJob::Base.queue_adapter = :sidekiq
-- 
cgit v1.2.3