Merge pull request #52 from matthewrudy/remove-test-warnings

Remove test warnings
matthewrudy · Aug 23, 2016 · 0987fd6 · 0987fd6
2 parents d0101e8 + 51ad5cf
commit 0987fd6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 12 deletions.
diff --git a/lib/memoist.rb b/lib/memoist.rb
@@ -117,8 +117,10 @@ def memoize(*method_names)
     end
 
     Memoist.memoist_eval(self) do
-      def self.memoized_methods
-        @_memoized_methods ||= []
+      unless singleton_class.method_defined?(:memoized_methods)
+        def self.memoized_methods
+          @_memoized_methods ||= []
+        end
       end
     end
 

diff --git a/test/memoist_test.rb b/test/memoist_test.rb
@@ -251,19 +251,18 @@ def test_flush_cache
 
     assert @calculator.instance_variable_get(:@_memoized_counter)
     @calculator.flush_cache(:counter)
-    assert_nil @calculator.instance_variable_get(:@_memoized_counter)
-    assert !@calculator.instance_variable_defined?(:@_memoized_counter)
+    assert_equal false, @calculator.instance_variable_defined?(:@_memoized_counter)
 
     assert_equal 2, @calculator.counter
   end
 
   def test_unmemoize_all
     assert_equal 1, @calculator.counter
 
+    assert_equal true, @calculator.instance_variable_defined?(:@_memoized_counter)
     assert @calculator.instance_variable_get(:@_memoized_counter)
     @calculator.unmemoize_all
-    assert_nil @calculator.instance_variable_get(:@_memoized_counter)
-    assert !@calculator.instance_variable_defined?(:@_memoized_counter)
+    assert_equal false, @calculator.instance_variable_defined?(:@_memoized_counter)
 
     assert_equal 2, @calculator.counter
   end
@@ -301,21 +300,21 @@ def test_unmemoize_all_subclasses
     assert_equal "very_senior", teacher.instance_variable_get(:@_memoized_seniority)
 
     teacher.unmemoize_all
-    assert_nil teacher.instance_variable_get(:@_memoized_name)
-    assert_nil teacher.instance_variable_get(:@_memoized_seniority)
+    assert_equal false, teacher.instance_variable_defined?(:@_memoized_name)
+    assert_equal false, teacher.instance_variable_defined?(:@_memoized_seniority)
 
     student = Student.new
     assert_equal "Student Josh", student.name
     assert_equal "Student Josh", student.instance_variable_get(:@_memoized_student_name)
-    assert_nil student.instance_variable_get(:@_memoized_seniority)
+    assert_equal false, student.instance_variable_defined?(:@_memoized_seniority)
 
     student.unmemoize_all
-    assert_nil student.instance_variable_get(:@_memoized_student_name)
+    assert_equal false, @calculator.instance_variable_defined?(:@_memoized_student_name)
   end
 
   def test_memoize_all
     @calculator.memoize_all
-    assert @calculator.instance_variable_defined?(:@_memoized_counter)
+    assert_equal true, @calculator.instance_variable_defined?(:@_memoized_counter)
   end
 
   def test_memoize_all_subclasses
@@ -334,7 +333,7 @@ def test_memoize_all_subclasses
 
     assert_equal "Student Josh", student.instance_variable_get(:@_memoized_student_name)
     assert_equal "Student Josh", student.name
-    assert_nil student.instance_variable_get(:@_memoized_seniority)
+    assert_equal false, student.instance_variable_defined?(:@_memoized_seniority)
   end
 
   def test_memoization_cache_is_different_for_each_instance