diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 18:14:49 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2006-07-08 18:14:49 +0000 |
| commit | 71234daef1517cf190adfc5978e56882d2a57ea6 (patch) | |
| tree | 71763eb04ed0a82e315e85272ea1f8064df64673 /activesupport/test/option_merger_test.rb | |
| parent | a3f459eecfec2beda2f51fb6d62eca4e5d5fbd70 (diff) | |
| download | rails-71234daef1517cf190adfc5978e56882d2a57ea6.tar.gz rails-71234daef1517cf190adfc5978e56882d2a57ea6.tar.bz2 rails-71234daef1517cf190adfc5978e56882d2a57ea6.zip | |
r4487@asus: jeremy | 2006-04-29 12:21:39 -0700
Check whether @flash is defined? for warnings-safety.
r4488@asus: jeremy | 2006-04-29 12:23:15 -0700
Check whether @flash is defined? for warnings-safety. Obviates nil? check.
r4489@asus: jeremy | 2006-04-29 12:45:18 -0700
Check whether @session is defined? for warnings-safety.
r4490@asus: jeremy | 2006-04-29 12:50:41 -0700
Check whether @rendering_runtime is defined? for warnings-safety.
r4491@asus: jeremy | 2006-04-29 12:55:01 -0700
Check whether @_cycles is defined? for warnings-safety.
r4492@asus: jeremy | 2006-04-29 12:59:19 -0700
Check whether instance variables are defined? for warnings-safety.
r4493@asus: jeremy | 2006-04-29 13:14:09 -0700
Add nil @template to PrototypeHelperTest to suppress unitialized instance variable warning.
r4494@asus: jeremy | 2006-04-29 13:31:34 -0700
Check whether @auto_index defined? for warnings-safety.
r4495@asus: jeremy | 2006-04-29 13:32:24 -0700
Wrap content_columns redefinitions with silence_warnings.
r4496@asus: jeremy | 2006-04-29 13:35:28 -0700
Wrap more redefinitions with silence_warnings.
r4829@asus: jeremy | 2006-07-08 10:59:20 -0700
abstract unit, fix warnings
r4830@asus: jeremy | 2006-07-08 11:06:12 -0700
Use parens to silence warning.
r4831@asus: jeremy | 2006-07-08 11:06:48 -0700
Use parens to silence warning.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activesupport/test/option_merger_test.rb')
| -rw-r--r-- | activesupport/test/option_merger_test.rb | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/activesupport/test/option_merger_test.rb b/activesupport/test/option_merger_test.rb index e97a4f918b..db32d4f6c1 100644 --- a/activesupport/test/option_merger_test.rb +++ b/activesupport/test/option_merger_test.rb @@ -1,25 +1,20 @@ -require 'test/unit' - -unless defined? ActiveSupport::OptionMerger - require File.dirname(__FILE__) + '/../lib/active_support/option_merger' - require File.dirname(__FILE__) + '/../lib/active_support/core_ext/object' -end +require File.dirname(__FILE__) + '/abstract_unit' 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), + 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 @@ -30,10 +25,10 @@ class OptionMergerTest < Test::Unit::TestCase def test_method_with_options_allows_to_overwrite_options local_options = {:hello => 'moon'} assert_equal @options.keys, local_options.keys - + with_options(@options) do |o| assert_equal local_options, method_with_options(local_options) - assert_equal @options.merge(local_options), + assert_equal @options.merge(local_options), o.method_with_options(local_options) assert_equal local_options, o.method_with_options(local_options) end |