From bdc36e4c3d4e436c76b652135f3fab94d49d0151 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Wed, 16 Oct 2013 19:24:22 -0700
Subject: [PATCH] Remove environment support in .yml, #1257

---
 .../chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb  | 3 ---
 test/config.yml                                               | 1 -
 test/test_cli.rb                                              | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb b/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
index 23f8053e..6f139475 100644
--- a/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
+++ b/examples/chef/cookbooks/sidekiq/templates/default/sidekiq.yml.erb
@@ -2,9 +2,6 @@
 <% if @verbose %>
 :verbose: <%= @verbose %>
 <% end %>
-<% if @environment %>
-:environment: <%= @environment %>
-<% end %>
 <% if @require %>
 :require: <%= @require %>
 <% end %>
diff --git a/test/config.yml b/test/config.yml
index f61458ae..2caf26a3 100644
--- a/test/config.yml
+++ b/test/config.yml
@@ -1,6 +1,5 @@
 ---
 :verbose:      false
-:environment:  xzibit
 :require:      ./test/fake_env.rb
 :pidfile:      /tmp/sidekiq-config-test.pid
 :logfile:      /tmp/sidekiq.log
diff --git a/test/test_cli.rb b/test/test_cli.rb
index b7d94bd1..bab569fe 100644
--- a/test/test_cli.rb
+++ b/test/test_cli.rb
@@ -174,8 +174,8 @@ class TestCli < Sidekiq::Test
         assert_equal './test/fake_env.rb', Sidekiq.options[:require]
       end
 
-      it 'sets environment' do
-        assert_equal 'xzibit', Sidekiq.options[:environment]
+      it 'does not set environment' do
+        assert_equal nil, Sidekiq.options[:environment]
       end
 
       it 'sets concurrency' do