1 files changed, 32 insertions, 0 deletions
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb
new file mode 100644
index 0000000000..0142db5b65
--- /dev/null
+++ b/activesupport/test/option_merger_test.rb
@@ -0,0 +1,32 @@
+require 'test/unit'
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+require 'active_support'
+
+class OptionMergerTest < Test::Unit::TestCase
+  def setup
+    @options = {:hello => 'world'}
+  end
+  
+  def test_method_with_options_merges_options_when_options_are_present
+    local_options = {:cool => true}
+    
+    with_options(@options) do |o|
+      assert_equal local_options, method_with_options(local_options)
+      assert_equal @options.merge(local_options), 
+        o.method_with_options(local_options)
+    end
+  end
+  
+  def test_method_with_options_appends_options_when_options_are_missing
+    with_options(@options) do |o|
+      assert_equal Hash.new, method_with_options
+      assert_equal @options, o.method_with_options
+    end
+  end
+
+  private
+    def method_with_options(options = {})
+      options
+    end
+end