aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test/memoizable_test.rb
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2011-06-15 02:52:12 -0700
committerJosé Valim <jose.valim@gmail.com>2011-06-15 02:52:12 -0700
commit6ab3da62083773cc507851694324cfb413f07ea8 (patch)
treefd4568516275ff60cfed9fd68354230d47567fa0 /activesupport/test/memoizable_test.rb
parent0438e92ae73544874ab9cd73d0a33e7a815c395b (diff)
parent9791e3e25221818f283e5e734772462b0d2d7d5d (diff)
downloadrails-6ab3da62083773cc507851694324cfb413f07ea8.tar.gz
rails-6ab3da62083773cc507851694324cfb413f07ea8.tar.bz2
rails-6ab3da62083773cc507851694324cfb413f07ea8.zip
Merge pull request #1707 from dmathieu/memoize
Allow last argument to be a boolean in memoized methods
Diffstat (limited to 'activesupport/test/memoizable_test.rb')
-rw-r--r--activesupport/test/memoizable_test.rb14
1 files changed, 14 insertions, 0 deletions
diff --git a/activesupport/test/memoizable_test.rb b/activesupport/test/memoizable_test.rb
index bceac1315b..7ffe132b80 100644
--- a/activesupport/test/memoizable_test.rb
+++ b/activesupport/test/memoizable_test.rb
@@ -96,6 +96,15 @@ class MemoizableTest < ActiveSupport::TestCase
end
memoize :fib
+ def add_or_subtract(i, j, add)
+ if add
+ i + j
+ else
+ i - j
+ end
+ end
+ memoize :add_or_subtract
+
def counter
@count ||= 0
@count += 1
@@ -199,6 +208,11 @@ class MemoizableTest < ActiveSupport::TestCase
assert_equal 13, @calculator.fib_calls
end
+ def test_memoization_with_boolean_arg
+ assert_equal 4, @calculator.add_or_subtract(2, 2, true)
+ assert_equal 2, @calculator.add_or_subtract(4, 2, false)
+ end
+
def test_object_memoization
[Company.new, Company.new, Company.new].each do |company|
company.extend ActiveSupport::Memoizable