active_record_block_matchers 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76aa63f8b10ab12208d486f38962b648d49c8789
-  data.tar.gz: a2d7d99eb3bb735bbfabd2a1192b0fc54e2f2194
+  metadata.gz: fcffbe7450c275e8f73887b109de06322a94a8f4
+  data.tar.gz: 5446e27ecf51297ba5a652776b957422118c6013
 SHA512:
-  metadata.gz: 9b8832aeb00039b04ca2a8897d5507d3bbac87352ed13bc08ec3846472297a5045097d073bdbd23728849fe022b38bde9feaba247ae2eec6b6f52371355519e2
-  data.tar.gz: 9e94d9770a73a56401bbb8f7334328fd8eb67c241c0400093eaa8d051bdb49605b65046892ac6f4f9ad27c937bc5ce9c774149761eb704e644fc21794ebf8d36
+  metadata.gz: 091547dfd038261e271f38391d842261e955f5f44f0ac55631bc1ec4d330bcaa203387a97bc8cf257fdfba2a55066922875aacbbc9acc51fbec4d464fa6fa474
+  data.tar.gz: d39f564c0f58925ae8bec51c5a0d6073a3fea5be6fc74a1c40456806a2443a4f4315ba02428e1793164e9b8284ada9562ba9adbe9a9df13cca42d2dc781c2c01

data/README.md

@@ -52,6 +52,19 @@ expect { User.create!(username: "BOB") }
   .with_attributes(username: "bob")
 ```
 
+If you need to make assertions about things other than attribute equality, you can also chain `.which` with a block, and your block will receive the newly created record:
+
+```ruby
+expect { User.create!(username: "BOB", password: "BlueSteel45") }
+  .to create_a_new(User)
+  .which { |user|
+    expect(user.encrypted_password).to be_present
+    expect(AuthLibrary.authenticate("bob", "BlueSteel45")).to eq user
+  }
+```
+
+**Gotcha Warning:** Be careful about your block syntax when chaining `.which` in your tests. If you write the above example with a `do...end`, the example will parse like this: `expect {...}.to(create_a_new(User).which) do |user| ... end`, so your block will not execute, and it may appear that your test is passing, when it is not.
+
 This matcher relies on a `created_at` column existing on the given model class.  The name of this column can be configured via `ActiveRecordBlockMatchers::Config.created_at_column_name = "your_column_name"`
 
 ## Development

data/lib/active_record_block_matchers/create_a_matcher.rb

@@ -1,47 +1,69 @@
 RSpec::Matchers.define :create_a_new do |klass|
   supports_block_expectations
 
+  description do
+    "create a #{klass}, optionally verifying attributes"
+  end
+
   chain(:with_attributes) do |attributes|
     @attributes = attributes
   end
 
+  chain(:which) do |&block|
+    @which_block = block
+  end
+
   match do |block|
-    @attributes ||= {}
     time_before = Time.current
+
     block.call
+
     column_name = ActiveRecordBlockMatchers::Config.created_at_column_name
     @created_records = klass.where("#{column_name} > ?", time_before)
     return false unless @created_records.count == 1
 
-    @failures = []
     record = @created_records.first
-    @attributes.each do |field, value|
+
+    @attribute_mismatches = []
+
+    @attributes && @attributes.each do |field, value|
       unless record.public_send(field) == value
-        @failures << [field, value, record.public_send(field)]
+        @attribute_mismatches << [field, value, record.public_send(field)]
       end
     end
-    @failures.empty?
-  end
 
-  description do
-    "create a #{klass}, optionally verifying attributes"
+    if @attribute_mismatches.none? && @which_block
+      begin
+        @which_block.call(record)
+      rescue RSpec::Expectations::ExpectationNotMetError => e
+        @which_failure = e
+      end
+    end
+
+    @attribute_mismatches.empty? && @which_failure.nil?
   end
 
   failure_message do
     if @created_records.count != 1
       "the block should have created 1 #{klass}, but created #{@created_records.count}"
-    else
-      @failures.map do |field, expected, actual|
-        "Expected #{field} to be: #{expected}, but was: #{actual}"
+    elsif @attribute_mismatches.any?
+      @attribute_mismatches.map do |field, expected, actual|
+        "Expected #{field.inspect} to be #{expected.inspect}, but was #{actual.inspect}"
       end.join("\n")
+    else
+      @which_failure.message
     end
   end
 
   failure_message_when_negated do
-    if @created_records.count == 1
-      "the block should not have created a #{klass}, but created #{@created_records.count}"
+    if @created_records.count == 1 && @attributes && @attribute_mismatches.none?
+      "the block should not have created a #{klass} with attributes #{@attributes.inspect}, but did"
+    elsif @created_records.count == 1 && @which_block && !@which_failure
+      "the newly created #{klass} should have failed an expectation in the given block, but didn't"
+    elsif @created_records.count == 1
+      "the block should not have created a #{klass}, but created #{@created_records.count}: #{@created_records.inspect}"
     else
-      "the block created a #{klass} that matched all given attributes"
+      "the block created a #{klass} that matched all given criteria"
     end
   end
 end

data/lib/active_record_block_matchers/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordBlockMatchers
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_block_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nathan Wallace
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -167,7 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Additional RSpec custom matchers for ActiveRecord