better_assert_difference 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa2297fff780387f5e5c006ac33decf0cf882891
-  data.tar.gz: a0e0a6916d2c546fba866e4e554f00734f4f48d9
+  metadata.gz: 79a753ea4125ca79f966f9cd2203a6d7d7c69362
+  data.tar.gz: 07ad13613eb6b1a048134113eeed4561d102d719
 SHA512:
-  metadata.gz: 307be0dbfad0e9579754b48ca80dddee6354a7ba4cc90918094074630f966ab85d3d8e6b4287b1be4030f94d53b3be17cc92bf2766f64a59a771e156716b930b
-  data.tar.gz: b467eae0a4cfeb12d9a2ba635ff5100a7bab49cba4e590218ee8bb78c772573a47abf78c5f70d59838afaa554878454ac5fdff0b7c63d424be099de9bb109944
+  metadata.gz: b740b8142a9bfa74c96d00d68ced4d12f4b37d3b6cf64a319fd5cabc3ec7f0bd70c114f8460833f7b1f969d219b612554cd08308ca1effb5f3f4ff21ca06b3db
+  data.tar.gz: 1974a1b7dd5c5c0f0233738c590aca17e971b2372e3c0be6367ef22fca980d193970f3b5fa5c8a034d27c9eae43679f100cde810760a99d845320f7d20af77a1

data/README.md

@@ -2,7 +2,7 @@
 # BetterAssertDifference
 `assert_difference`, but better.
 
-![https://travis-ci.org/julien-meichelbeck/better_assert_difference](https://api.travis-ci.org/julien-meichelbeck/better_assert_difference.svg?branch=master)
+![](https://api.travis-ci.org/julien-meichelbeck/better_assert_difference.svg?branch=master)
 
 ## Installation
 
@@ -41,14 +41,15 @@ You can use `assert_difference` just as usual with string expressions or procs:
   assert_difference('Foo.bar.count', 3) do
     # block omitted
   end
-  
+
   assert_difference(-> { Foo.bar.count }, 2) do
     # block omitted
   end
 ```
 
-#### Implicit call of `count` on ActiveRecord relations, arrays, etc.
-Most of the time you'll want to `count` objects. You won't have to use string expressions or procs, just pass an `ActiveRecord_Relation` object or an array.
+#### Implicit call of `count` on ActiveRecord relations
+Most of the time you'll want to execute `count` on ActiveRecord::Relation objects, this call is now implicit and you won't have to
+use a string expression or a proc.
 ```ruby
   assert_difference(Foo.where(bar: true)) do
     # block omitted
@@ -63,7 +64,13 @@ Specify an expected difference for each expression:
   end
 ```
 
-
+#### Better error message
+assert_difference will list all the assertions that have failed, not just the first one.
+```console
+  Test failure:
+  @items.select(&:nil?).count didn't change by 2
+  @items.count didn't change by 3
+```
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/julien-meichelbeck/better_assert_difference.

data/lib/better_assert_difference.rb

@@ -2,20 +2,22 @@ require 'better_assert_difference/version'
 
 module BetterAssertDifference
   DEFAULT_DIFF = 1
+  ACTIVE_RECORD_ENABLED = !!defined?(ActiveRecord::Base)
 
   def assert_difference(expression, difference = DEFAULT_DIFF, message = nil, &block)
     expression_to_diff =
       if expression.is_a?(Hash)
         expression
       else
-        Array(expression).each_with_object({}) { |exp, expression_hash| expression_hash[exp] = DEFAULT_DIFF }
+        Array(expression).each_with_object({}) { |exp, expression_hash| expression_hash[exp] = difference }
       end
+
     block_to_diff =
       expression_to_diff.each_with_object({}) do |(exp, diff), expression_hash|
         key =
           if exp.respond_to?(:call)
             exp
-          elsif exp.respond_to?(:count) && !exp.is_a?(String)
+          elsif ACTIVE_RECORD_ENABLED && active_record?(exp)
             -> { exp.count }
           else
             -> { eval(exp, block.binding) }
@@ -29,7 +31,7 @@ module BetterAssertDifference
     errors = []
     before.zip(after, expression_to_diff) do |before_value, after_value, (exp, diff)|
       next if before_value + diff == after_value
-      error  = "#{exp.inspect} didn't change by #{diff}"
+      error  = "#{exp.inspect} didn't change by #{diff} (before: #{before_value}, after: #{after_value})"
       error  = "#{message}.\n#{error}" if message
       errors << error
     end
@@ -37,4 +39,11 @@ module BetterAssertDifference
 
     retval
   end
+
+  private
+
+    def active_record?(expression)
+      expression.respond_to?(:ancestors) &&
+        expression.ancestors.map(&:to_s).include?('ActiveRecord::Base')
+    end
 end

data/lib/better_assert_difference/version.rb

@@ -1,3 +1,3 @@
 module BetterAssertDifference
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: better_assert_difference
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Julien Meichelbeck
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-03 00:00:00.000000000 Z
+date: 2017-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler