From 33b9999c433b293db2318403ed6a4ebab1484578 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Fri, 9 Jan 2015 17:08:58 +0000
Subject: [PATCH 1/3] Stringify Sidekiq.default_worker_options's keys, fix
 #2124

---
 Changes.md           |  1 +
 lib/sidekiq.rb       |  2 +-
 test/test_sidekiq.rb | 12 ++++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/Changes.md b/Changes.md
index 7dc36fcc..a887ef8d 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,5 +1,6 @@
 HEAD
 -----------
+- Stringify Sidekiq.default_worker_options's keys [#]
 - Add random integer to process identity [#2113, michaeldiscala]
 - Log Sidekiq Pro's Batch ID if available [#2076]
 - Refactor Processor Redis usage to avoid redis/redis-rb#490 [#]
diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
index b85bf8e1..6b27cc1b 100644
--- a/lib/sidekiq.rb
+++ b/lib/sidekiq.rb
@@ -97,7 +97,7 @@ module Sidekiq
   end
 
   def self.default_worker_options=(hash)
-    @default_worker_options = default_worker_options.merge(hash)
+    @default_worker_options = default_worker_options.merge(hash).stringify_keys!
   end
 
   def self.default_worker_options
diff --git a/test/test_sidekiq.rb b/test/test_sidekiq.rb
index 6f59433e..fcf5d1c2 100644
--- a/test/test_sidekiq.rb
+++ b/test/test_sidekiq.rb
@@ -54,4 +54,16 @@ class TestSidekiq < Sidekiq::Test
       assert_equal 2, Sidekiq.options[:lifecycle_events][:startup].first.call
     end
   end
+
+  describe 'default_worker_options' do
+    before do
+      @old_options = Sidekiq.default_worker_options
+    end
+    after  { Sidekiq.default_worker_options = @old_options }
+
+    it 'stringify keys' do
+      Sidekiq.default_worker_options = { queue: 'cat'}
+      assert_equal 'cat', Sidekiq.default_worker_options['queue']
+    end
+  end
 end

From bab38f194c6c73c12eef0c0e409ae159cb873387 Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Fri, 9 Jan 2015 18:08:19 +0000
Subject: [PATCH 2/3] Add issue number Use stringify_keys instead of
 stringify_keys!

---
 Changes.md     | 2 +-
 lib/sidekiq.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Changes.md b/Changes.md
index a887ef8d..01e17e00 100644
--- a/Changes.md
+++ b/Changes.md
@@ -1,6 +1,6 @@
 HEAD
 -----------
-- Stringify Sidekiq.default_worker_options's keys [#]
+- Stringify Sidekiq.default_worker_options's keys [#2126]
 - Add random integer to process identity [#2113, michaeldiscala]
 - Log Sidekiq Pro's Batch ID if available [#2076]
 - Refactor Processor Redis usage to avoid redis/redis-rb#490 [#]
diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
index 6b27cc1b..f57a6160 100644
--- a/lib/sidekiq.rb
+++ b/lib/sidekiq.rb
@@ -97,7 +97,7 @@ module Sidekiq
   end
 
   def self.default_worker_options=(hash)
-    @default_worker_options = default_worker_options.merge(hash).stringify_keys!
+    @default_worker_options = default_worker_options.merge(hash).stringify_keys
   end
 
   def self.default_worker_options

From 2282cbbeaa17a6501e127fa3f18d08d0ea68eabc Mon Sep 17 00:00:00 2001
From: Abdelkader Boudih <terminale@gmail.com>
Date: Fri, 9 Jan 2015 18:26:21 +0000
Subject: [PATCH 3/3] Stringify the hash

---
 lib/sidekiq.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/sidekiq.rb b/lib/sidekiq.rb
index f57a6160..4685029e 100644
--- a/lib/sidekiq.rb
+++ b/lib/sidekiq.rb
@@ -97,7 +97,7 @@ module Sidekiq
   end
 
   def self.default_worker_options=(hash)
-    @default_worker_options = default_worker_options.merge(hash).stringify_keys
+    @default_worker_options = default_worker_options.merge(hash.stringify_keys)
   end
 
   def self.default_worker_options