rspec-spy 0.1.0 → 1.0.0

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## Version 1.0.0
+
+* Removed `strict_mode` and use `should_have_received` and `should_have_not_received` instead
+of overriding the original RSpec::Mocks methods. `should_receive` and `should_not_receive` will
+still work, but aren't recommended.

data/README.md

@@ -14,11 +14,11 @@ describe "Example" do
   end
 
   it "should receive a message", :spy => true do
-    collaborator.should_receive :message
+    collaborator.should_have_received :message
   end
 
   it "should not receive other_message", :spy => true do
-    collaborator.should_not_receive :other_message
+    collaborator.should_not_have_received :other_message
   end
 end
 ```
@@ -43,15 +43,6 @@ Add to your spec_helper.rb:
 require 'rspec-spy'
 ```
 
-If you want to be warned when using `should_receive` outside of `spy` blocks (recommended)
-add this to your `spec_helper.rb`:
-
-``` ruby
-# Require should_receive and should_not_receive to be inside spy blocks
-# Use should_receive! and should_not_receive! outside spy blocks
-RSpec::Spy.strict_mode = true
-```
-
 ## Usage
 
 Just tag your examples with `:spy => true` or `:spy` (if you use
@@ -61,12 +52,12 @@ used to, including spying on class methods.
 
 ``` ruby
 it "should receive message", :spy => true do
-  collaborator.should_receive :message
+  collaborator.should_have_received :message
 end
 
 # with config.treat_symbols_as_metadata_keys_with_true_values = true
 it "should receive message", :spy do
-  collaborator.should_receive :message
+  collaborator.should_have_received :message
 end
 ```
 
@@ -88,11 +79,11 @@ describe "what not to do" do
   # These will fail because @collaborator is nil because this happens
   # before the above before block
   it "should receive a message", :spy => true do
-    @collaborator.should_receive :message
+    @collaborator.should_have_received :message
   end
 
   it "should not receive other_message", :spy => true do
-    @collaborator.should_not_receive :other_message
+    @collaborator.should_not_have_received :other_message
   end
 end
 ```
@@ -118,7 +109,7 @@ describe "stubbing and mocking at the same time" do
   end
 
   it "should receive a message", :spy => true do
-    collaborator.should_receive(:message).and_return(5)
+    collaborator.should_have_received(:message).and_return(5)
   end
 end
 ```
@@ -129,6 +120,7 @@ end
 * [bourne](https://github.com/thoughtbot/bourne)
 * [rspec-spies](https://github.com/technicalpickles/rspec-spies)
 * [gimme](https://github.com/searls/gimme)
+* [fakes-rspec](https://github.com/developwithpassion/fakes-rspec)
 
 ## Contributing
 

data/lib/rspec/spy/mock_methods.rb

@@ -1,26 +1,23 @@
 require 'rspec/mocks'
 
 RSpec::Mocks::Methods.class_eval do
-  def should_receive_with_spy_check(message, opts={}, &block)
-    spy_check(:should_receive)
-    nil_check(:should_receive)
+  def should_have_received(message, opts={}, &block)
+    check(:should_have_received)
     __mock_proxy.add_message_expectation(opts[:expected_from] || caller(1)[0], message.to_sym, opts, &block)
   end
 
-  def should_not_receive_with_spy_check(message, &block)
-    spy_check(:should_not_receive)
-    nil_check(:should_not_receive)
+  def should_not_have_received(message, &block)
+    check(:should_not_have_received)
     __mock_proxy.add_negative_message_expectation(caller(1)[0], message.to_sym, &block)
   end
 
-  alias_method :should_receive!, :should_receive
-  alias_method :should_receive, :should_receive_with_spy_check
-
-  alias_method :should_not_receive!, :should_not_receive
-  alias_method :should_not_receive, :should_not_receive_with_spy_check
-
   private
 
+  def check(method)
+    spy_check(method)
+    nil_check(method)
+  end
+
   def spy_check(method)
     return if RSpec::Spy.ok_to_spy?
     raise "#{method} should not be used outside of a spy block. Please put it in a spy block or use #{method}!."

data/lib/rspec/spy/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Spy
-    VERSION = "0.1.0"
+    VERSION = "1.0.0"
   end
 end

data/lib/rspec/spy.rb

@@ -2,12 +2,9 @@ module RSpec
   module Spy
     class << self
       attr_accessor :in_run_spy
-      attr_accessor :strict_mode
       alias_method :in_run_spy?, :in_run_spy
-      alias_method :strict_mode?, :strict_mode
 
       def ok_to_spy?
-        return true unless strict_mode?
         in_run_spy?
       end
     end

data/spec/{rspec_spy_spec.rb → rspec-spy_spec.rb}

@@ -7,8 +7,6 @@ class Subject
   end
 end
 
-RSpec::Spy.strict_mode = true
-
 describe RSpec::Spy do
   let(:collaborator) { stub.as_null_object }
 
@@ -16,20 +14,20 @@ describe RSpec::Spy do
     Subject.new.go(collaborator)
   end
 
-  it "should work with should_receive", :spy do
-    collaborator.should_receive :message
+  it "should work with should_have_received", :spy do
+    collaborator.should_have_received :message
   end
 
   it "should work with multiple in one spy block", :spy do
-    collaborator.should_receive :message
+    collaborator.should_have_received :message
   end
 
   it "should work with not", :spy do
-    collaborator.should_not_receive :other_message
+    collaborator.should_not_have_received :other_message
   end
 
   specify "should work with specify", :spy do
-    collaborator.should_receive :message
+    collaborator.should_have_received :message
   end
 end
 
@@ -42,7 +40,7 @@ describe RSpec::Spy do
 
   context do
     it "should work in nested contexts", :spy do
-      collaborator.should_receive :message
+      collaborator.should_have_received :message
     end
   end
 end
@@ -51,8 +49,8 @@ describe RSpec::Spy, "the old way" do
   let(:collaborator) { stub.as_null_object }
 
   before do
-    collaborator.should_receive! :message
-    collaborator.should_not_receive! :message2
+    collaborator.should_have_received! :message
+    collaborator.should_not_have_received! :message2
     Subject.new.go(collaborator)
   end
 
@@ -60,12 +58,12 @@ describe RSpec::Spy, "the old way" do
   end
 end
 
-describe RSpec::Spy, "should_receive outside of spy block" do
+describe RSpec::Spy, "should_have_received outside of spy block" do
   let(:collaborator) { stub.as_null_object }
 
   it "should warn" do
-    lambda { collaborator.should_receive :message }.should raise_error
-    lambda { collaborator.should_not_receive :message }.should raise_error
+    lambda { collaborator.should_have_received :message }.should raise_error
+    lambda { collaborator.should_not_have_received :message }.should raise_error
   end
 end
 
@@ -78,20 +76,20 @@ describe RSpec::Spy, "setting on context" do
 
   context "spies", :spy do
     it "should work" do
-      collaborator.should_receive :message
+      collaborator.should_have_received :message
     end
   end
 end
 
 describe RSpec::Spy, "nil warning" do
-  it "should warn me if I try to should_receive on nil", :spy do
-    lambda { @unknown.should_receive :message }.should raise_error
-    lambda { @unknown.should_not_receive :message }.should raise_error
+  it "should warn me if I try to should_have_received on nil", :spy do
+    lambda { @unknown.should_have_received :message }.should raise_error
+    lambda { @unknown.should_not_have_received :message }.should raise_error
   end
 
   it "should not warn me if I allow message expectations on nil", :spy do
     RSpec::Mocks::Proxy.allow_message_expectations_on_nil
-    lambda { @unknown.should_not_receive :message }.should_not raise_error
+    lambda { @unknown.should_not_have_received :message }.should_not raise_error
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-spy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-04 00:00:00.000000000 Z
+date: 2012-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70191611940020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191611940020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
-  requirement: &70191611939520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70191611939520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70191611939140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70191611939140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Enables AAA testing for rspec-mock
 email:
 - aaronjensen@gmail.com
@@ -54,6 +69,7 @@ files:
 - .gitignore
 - .rspec
 - .rvmrc.template
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
@@ -63,7 +79,7 @@ files:
 - lib/rspec/spy/mock_methods.rb
 - lib/rspec/spy/version.rb
 - rspec-spy.gemspec
-- spec/rspec_spy_spec.rb
+- spec/rspec-spy_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -85,10 +101,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.17
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
-summary: rspec-spy-0.1.0
+summary: rspec-spy-1.0.0
 test_files:
-- spec/rspec_spy_spec.rb
+- spec/rspec-spy_spec.rb
 - spec/spec_helper.rb