Merge pull request #173 from jsw0528/master

fix `can't convert Fixnum into String` for `replace`
This commit is contained in:
Dylan Thacker-Smith
2013-06-04 13:09:42 -07:00
committed by Florian Weingarten
parent 53b6db48e3
commit fc63219087
2 changed files with 5 additions and 5 deletions

View File

@@ -107,12 +107,12 @@ module Liquid
# Replace occurrences of a string with another
def replace(input, string, replacement = '')
input.to_s.gsub(string, replacement)
input.to_s.gsub(string, replacement.to_s)
end
# Replace the first occurrences of a string with another
def replace_first(input, string, replacement = '')
input.to_s.sub(string, replacement)
input.to_s.sub(string, replacement.to_s)
end
# remove a substring

View File

@@ -157,9 +157,9 @@ class StandardFiltersTest < Test::Unit::TestCase
end
def test_replace
assert_equal 'b b b b', @filters.replace("a a a a", 'a', 'b')
assert_equal 'b a a a', @filters.replace_first("a a a a", 'a', 'b')
assert_template_result 'b a a a', "{{ 'a a a a' | replace_first: 'a', 'b' }}"
assert_equal '2 2 2 2', @filters.replace('1 1 1 1', '1', 2)
assert_equal '2 1 1 1', @filters.replace_first('1 1 1 1', '1', 2)
assert_template_result '2 1 1 1', "{{ '1 1 1 1' | replace_first: '1', 2 }}"
end
def test_remove