Skip to content

Commit

Permalink
Fixed ambiguous first argument warning in ArrayExtTest.
Browse files Browse the repository at this point in the history
  • Loading branch information
josh committed Jun 9, 2008
1 parent 1b38705 commit d2a3723
Showing 1 changed file with 12 additions and 14 deletions.
26 changes: 12 additions & 14 deletions activesupport/test/core_ext/array_ext_test.rb
Expand Up @@ -21,7 +21,7 @@ def to_param
"#{self}1"
end
end

def test_string_array
assert_equal '', %w().to_param
assert_equal 'hello/world', %w(hello world).to_param
Expand All @@ -31,7 +31,7 @@ def test_string_array
def test_number_array
assert_equal '10/20', [10, 20].to_param
end

def test_to_param_array
assert_equal 'custom1/param1', [ToParam.new('custom'), ToParam.new('param')].to_param
end
Expand Down Expand Up @@ -222,10 +222,10 @@ def test_to_xml_with_block

assert xml.include?(%(<count>2</count>)), xml
end

def test_to_xml_with_empty
xml = [].to_xml
assert_match /type="array"\/>/, xml
assert_match(/type="array"\/>/, xml)
end
end

Expand All @@ -239,17 +239,15 @@ def test_extract_options
end

uses_mocha "ArrayExtRandomTests" do
class ArrayExtRandomTests < Test::Unit::TestCase
def test_random_element_from_array
assert_nil [].rand

class ArrayExtRandomTests < Test::Unit::TestCase
def test_random_element_from_array
assert_nil [].rand

Kernel.expects(:rand).with(1).returns(0)
assert_equal 'x', ['x'].rand
Kernel.expects(:rand).with(1).returns(0)
assert_equal 'x', ['x'].rand

Kernel.expects(:rand).with(3).returns(1)
assert_equal 2, [1, 2, 3].rand
Kernel.expects(:rand).with(3).returns(1)
assert_equal 2, [1, 2, 3].rand
end
end
end

end

0 comments on commit d2a3723

Please sign in to comment.