From 568462eff78bbad6b1e201e98956ebd14265764d Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Mon, 26 Mar 2012 19:56:48 -0700
Subject: [PATCH] Clean up rails hook testing

---
 test/test_extension_configuration.rb | 28 ----------------------------
 test/test_extensions.rb              | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 28 deletions(-)
 delete mode 100644 test/test_extension_configuration.rb

diff --git a/test/test_extension_configuration.rb b/test/test_extension_configuration.rb
deleted file mode 100644
index eff6cef1..00000000
--- a/test/test_extension_configuration.rb
+++ /dev/null
@@ -1,28 +0,0 @@
-require 'helper'
-require 'sidekiq'
-
-class TestExtensionConfiguration < MiniTest::Unit::TestCase
-  describe 'sidekiq rails extensions configuration' do
-    before do
-      @options = Sidekiq.options
-    end
-
-    after do
-      Sidekiq.options = @options
-    end
-    
-    it 'should set enable_rails_extensions option to true by default' do
-      assert_equal true, Sidekiq.options[:enable_rails_extensions]
-    end
-
-    it 'should extend ActiveRecord and ActiveMailer if enable_rails_extensions is true' do
-      assert_equal ActionMailer::Base, Sidekiq.hook_rails!
-    end
-
-    it 'should not extend ActiveRecord and ActiveMailer if enable_rails_extensions is false' do
-      Sidekiq.options = { :enable_rails_extensions => false }
-      assert_equal nil, Sidekiq.hook_rails!
-    end
-
-  end
-end
diff --git a/test/test_extensions.rb b/test/test_extensions.rb
index 01dbbab0..a7e9b805 100644
--- a/test/test_extensions.rb
+++ b/test/test_extensions.rb
@@ -41,6 +41,28 @@ class TestExtensions < MiniTest::Unit::TestCase
       assert_equal ['default'], Sidekiq::Client.registered_queues
       assert_equal 1, Sidekiq.redis.llen('queue:default')
     end
+  end
 
+  describe 'sidekiq rails extensions configuration' do
+    before do
+      @options = Sidekiq.options
+    end
+
+    after do
+      Sidekiq.options = @options
+    end
+
+    it 'should set enable_rails_extensions option to true by default' do
+      assert Sidekiq.options[:enable_rails_extensions]
+    end
+
+    it 'should extend ActiveRecord and ActiveMailer if enable_rails_extensions is true' do
+      assert Sidekiq.hook_rails!
+    end
+
+    it 'should not extend ActiveRecord and ActiveMailer if enable_rails_extensions is false' do
+      Sidekiq.options = { :enable_rails_extensions => false }
+      refute Sidekiq.hook_rails!
+    end
   end
 end