fix minitest assertions to accept a string as a proc

westonganger · Aug 30, 2016 · e6f0527 · e6f0527
1 parent 2c5d288
commit e6f0527
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -205,7 +205,11 @@ my_hash.compact!
 
 ### Minitest Method
 ```ruby
-assert_changed -> { user.name } do
+assert_changed 'user.name' do
+  user.name = "Bob"
+end
+
+assert_not_changed -> { user.name } do
   user.update(user_params)
 end
 
@@ -221,7 +225,7 @@ If you want to contribute here are a couple of things you could do:
 
 - Add Tests for Rails methods
 - Get the `natural_sort` method to accept a block
-- Get the `assert_changed` and `assert_not_changed` method to accept a String with the variable name similar to Rails `assert_difference`
+- Get the `assert_changed` and `assert_not_changed` method to accept a String with the variable name similar to Rails ``
 
 
 # Credits

diff --git a/lib/rearmed/monkey_patches/minitest.rb b/lib/rearmed/monkey_patches/minitest.rb
@@ -6,24 +6,27 @@
 
     if enabled || Rearmed.dig(Rearmed.enabled_patches, :minitest, :assert_changed)
       def assert_changed(expression, &block)
-        #unless expression.respond_to?(:call)
-        #  expression = lambda{ eval(expression, block.binding) }
-        #  expression = lambda{ block.binding.eval("#{expression}") }
-        #end
-        old = expression.call
+        if expression.respond_to?(:call)
+          e = expression
+        else
+          e = lambda{ block.binding.eval(expression) }
+        end
+        old = e.call
         block.call
-        refute_equal old, expression.call
+        refute_equal old, e.call
       end
     end
 
     if enabled || Rearmed.dig(Rearmed.enabled_patches, :minitest, :assert_not_changed)
       def assert_not_changed(expression, &block)
-        unless expression.respond_to?(:call)
-          expression = lambda{ eval(expression, block.binding) }
+        if expression.respond_to?(:call)
+          e = expression
+        else
+          e = lambda{ block.binding.eval(expression) }
         end
-        old = expression.call
+        old = e.call
         block.call
-        assert_equal old, expression.call
+        assert_equal old, e.call
       end
     end
 

diff --git a/test/tc_rearmed.rb b/test/tc_rearmed.rb
@@ -176,10 +176,10 @@ def test_object
   end
 
   def test_minitest
-    #str = 'first'
-    #assert_changed "str" do
-    #  str = 'second'
-    #end
+    str = 'first'
+    assert_changed "str" do
+      str = 'second'
+    end
 
     str = 'first'
     assert_changed ->{ str } do
@@ -191,10 +191,10 @@ def test_minitest
       name = 'second'
     end
 
-    #name = 'first'
-    #assert_not_changed 'name' do
-    #  name = 'first'
-    #end
+    name = 'first'
+    assert_not_changed 'name' do
+      name = 'first'
+    end
 
     name = 'first'
     assert_not_changed ->{ name } do