fakes-rspec 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a31d41eefe7f164425a119dfc161ae76b5dc97f5
-  data.tar.gz: 386040e2e3f3d321ea271e7da32e4f36bff8154f
+  metadata.gz: 6f15ab9ad7b838efacecdedd5a966423ddb09a82
+  data.tar.gz: a8d59a776ec88595fbb4f4cb448a724889f1718b
 SHA512:
-  metadata.gz: b4f539e4bdd5d82f65c604a8f1cb5821f67ffa9bd0152774433f8a285afc8073eec87442d7db13b135ffd3a76ebb2d13b60dced80c42ee2700890f991bc148d7
-  data.tar.gz: 7630d8f7f2fec481fcb3fa8cb4d779a0e9b7b39258aa13d35676ac5a40e0d42f2fd435c1f36ddd441d9ceb91dfe80c85d755f2afd10ee405cef534c63ca4e532
+  metadata.gz: 4cae4c7c2d2c104289e5d920cf4ed790f0c2dac928d73b09494b4b18017e8ec70a3ec5d249bb18a19fe9f412aa6174f3ce7bdcd245194e82e14e5ef3b291ec66
+  data.tar.gz: 03f256c31540a8f82eccbe2a08b468ecd01958b00f10553ffb8e6c5a4f4dbd544ce8c1f1c7c64c883390359b4115dc877c66673b32a4b737f804768046487f3e

data/fakes-rspec.gemspec

@@ -22,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency('guard', "~> 2.6.1")
   s.add_development_dependency('guard-rspec', "~> 4.2.9")
   s.add_runtime_dependency('fakes', "~> 1.1.4")
-  s.add_runtime_dependency('rspec', "~> 2.14.1")
+  s.add_runtime_dependency('rspec', "~> 3.0")
 end

data/lib/fakes-rspec.rb

@@ -3,11 +3,11 @@ require 'rspec'
 require 'singleton'
 
 require 'fakes_rspec/block_criteria'
-require 'fakes_rspec/matcher'
 require 'fakes_rspec/nullo_specification'
 require 'fakes_rspec/occurrences'
 require 'fakes_rspec/received_occurrences_criteria'
 require 'fakes_rspec/received_criteria'
+require 'fakes_rspec/matcher'
 
 RSpec.configure do |config|
   config.after(:each) do

data/lib/fakes_rspec/matcher.rb

@@ -2,10 +2,14 @@ module RSpec
   def self.create_received_criteria_from(the_call)
     return Fakes::RSpec::ReceivedCriteria.new(the_call)
   end
-  def self.create_received_occurences_criteria_from(the_call,occurence)
-    return Fakes::RSpec::ReceivedOccurrencesCriteria.new(create_received_criteria_from(the_call),the_call,occurence)
+
+  def self.create_received_occurences_criteria_from(the_call, occurence)
+    occurence_spec = occurence.nil? ? Fakes::RSpec::NulloSpecification.instance : occurence
+
+    return Fakes::RSpec::ReceivedOccurrencesCriteria.new(create_received_criteria_from(the_call),the_call,occurence_spec)
   end
 
+
   Matchers.define :have_received_message do|symbol,*args|
     @occurence_spec = Fakes::RSpec::NulloSpecification.instance
 
@@ -39,8 +43,11 @@ module RSpec
     chain :occurs do|the_proc|
       @occurence_spec = Fakes::RSpec::Occurrences.from_block(the_proc)
     end
+
     match do|the_fake|
-      RSpec.create_received_occurences_criteria_from(the_fake.received(symbol),@occurence_spec).is_satisfied_by(*args)
+      criteria = RSpec.create_received_occurences_criteria_from(the_fake.received(symbol),@occurence_spec)
+
+      criteria.is_satisfied_by(*args)
     end
   end
 end

data/lib/fakes_rspec/version.rb

@@ -1,5 +1,5 @@
 module Fakes
   module RSpec
-    VERSION = "2.0.0"
+    VERSION = "2.1.0"
   end
 end

data/spec/specs/block_criteria_spec.rb

@@ -6,8 +6,8 @@ module Fakes
       context "when matching" do
         subject{BlockCriteria.new(lambda{|item| return item == 1})}
         it "should match if its block returns true" do
-          subject.is_satisfied_by(1).should be_true
-          subject.is_satisfied_by(2).should be_false
+          expect(subject.is_satisfied_by(1)).to be_truthy
+          expect(subject.is_satisfied_by(2)).to be_falsy
         end
       end
     end

data/spec/specs/nullo_specification_spec.rb

@@ -6,7 +6,9 @@ module Fakes
       subject{NulloSpecification.instance}
 
       it "should be satisfied by anything" do
-        [1,10,"a",Object.new].each{|item| subject.is_satisfied_by(item).should be_true}
+        [1,10,"a",Object.new].each do |item| 
+          expect(subject.is_satisfied_by(item)).to be_truthy 
+        end
       end
     end
   end

data/spec/specs/occurrences_spec.rb

@@ -7,8 +7,8 @@ module Fakes
         subject{Occurrences.exact(1)}
 
         it "should create a matcher that matches an exact number of occurrences" do
-          subject.is_satisfied_by(1).should be_true
-          subject.is_satisfied_by(2).should be_false
+          expect(subject.is_satisfied_by(1)).to be_truthy
+          expect(subject.is_satisfied_by(2)).to be_falsy
         end
       end
 
@@ -16,19 +16,19 @@ module Fakes
         subject{Occurrences.at_least(3)}
 
         it "should create a matcher that matches an exact number of occurrences" do
-          subject.is_satisfied_by(3).should be_true
-          subject.is_satisfied_by(4).should be_true
-          subject.is_satisfied_by(2).should be_false
+          expect(subject.is_satisfied_by(3)).to be_truthy
+          expect(subject.is_satisfied_by(4)).to be_truthy
+          expect(subject.is_satisfied_by(2)).to be_falsy
         end
       end
       context "when creating an at most occurrence matcher" do
         subject{Occurrences.at_most(3)}
 
         it "should create a matcher that matches an exact number of occurrences" do
-          subject.is_satisfied_by(3).should be_true
-          subject.is_satisfied_by(2).should be_true
-          subject.is_satisfied_by(1).should be_true
-          subject.is_satisfied_by(4).should be_false
+          expect(subject.is_satisfied_by(3)).to be_truthy
+          expect(subject.is_satisfied_by(2)).to be_truthy
+          expect(subject.is_satisfied_by(1)).to be_truthy
+          expect(subject.is_satisfied_by(4)).to be_falsy
         end
       end
     end

data/spec/specs/received_criteria_spec.rb

@@ -10,7 +10,7 @@ module Fakes
 
           sut = ReceivedCriteria.new(item.received(:hello))
 
-          sut.is_satisfied_by.should be_true
+          expect(sut.is_satisfied_by).to be_truthy
         end
       end
       context "when matching a call made with arguments" do
@@ -21,16 +21,16 @@ module Fakes
         end
         context "and we care about the arguments it was called with" do
           it "should match if it received the correct call" do
-            @sut.is_satisfied_by("world").should be_true
+            expect(@sut.is_satisfied_by("world")).to be_truthy
           end
           it "should not match if the arguments provided are not in the call history" do
-            @sut.is_satisfied_by("yo").should be_false
+            expect(@sut.is_satisfied_by("yo")).to be_falsy
           end
 
         end
         context "and we don't care about the arguments it was called with" do
           it "should match if it received a call to the method" do
-            @sut.is_satisfied_by.should be_true
+            expect(@sut.is_satisfied_by).to be_truthy
           end
         end
       end

data/spec/specs/received_occurrences_criteria_spec.rb

@@ -8,18 +8,20 @@ module Fakes
       let(:the_call){fake}
       let(:arg_set){fake}
       let(:the_arg){1}
+
       subject{ReceivedOccurrencesCriteria.new(original,the_call,occurrence)}
+
       context "when matching a call made" do
         context "and the original criteria is not satisfied" do
           before (:each) do
             original.stub(:is_satisfied_by).with(the_arg).and_return(false)
           end
           it "should not match" do
-            subject.is_satisfied_by(the_arg).should be_false
+            expect(subject.is_satisfied_by(the_arg)).to be_falsy
           end
           it "should not use the occurrence or the call" do
-            occurrence.should_not have_received_message(:is_satisfied_by)
-            the_call.should_not have_received_message(:called_with)
+            expect(occurrence.received?(:is_satisfied_by)).to be_falsy
+            expect(the_call.received?(:called_with)).to be_falsy
           end
         end
         context "and the original criteria is satisfied" do
@@ -38,7 +40,7 @@ module Fakes
               @result = subject.is_satisfied_by
             end
             it "should match if the occurrence matches the total number of invocations" do
-              @result.should be_true
+              expect(@result).to be_truthy
             end
           end
           context "and its occurrence is satisfied" do
@@ -46,7 +48,7 @@ module Fakes
               occurrence.stub(:is_satisfied_by).with(1).and_return(true)
             end
             it "should match" do
-              subject.is_satisfied_by(the_arg).should be_true
+              expect(subject.is_satisfied_by(the_arg)).to be_truthy
             end
           end
           context "and its occurrence is not satisfied" do
@@ -54,7 +56,7 @@ module Fakes
               occurrence.stub(:is_satisfied_by).with(1).and_return(false)
             end
             it "should not match" do
-              subject.is_satisfied_by(the_arg).should be_false
+              expect(subject.is_satisfied_by(the_arg)).to be_falsy
             end
           end
         end

data/spec/specs/usage_spec.rb

@@ -6,11 +6,13 @@ describe "using the rspec extensions" do
     item.hello
     item.last("other")
 
-    item.should_not have_received_message(:hello,"world")
-    item.should have_received_message(:hello)
-    item.should_not have_received_message(:once_more)
-    item.should_not have_received_message(:last,"hello")
-    item.should have_received_message(:last,"other")
+    expect(item).to_not have_received_message(:hello, "world")
+    expect(item).to have_received_message(:hello)
+    expect(item).to_not have_received_message(:hello,"world")
+    expect(item).to have_received_message(:hello)
+    expect(item).to_not have_received_message(:once_more)
+    expect(item).to_not have_received_message(:last,"hello")
+    expect(item).to have_received_message(:last,"other")
   end
 
   it "should be able to determine if a call has been made a certain number of times" do
@@ -19,20 +21,22 @@ describe "using the rspec extensions" do
     item.hello
     item.last("other")
 
-    item.should_not have_received_message(:hello,"world")
-    item.should have_received_message(:hello).twice
-    item.should have_received_message(:hello)
-    item.should_not have_received_message(:once_more)
-    item.should_not have_received_message(:last,"hello")
-    item.should have_received_message(:last,"other").once
-    item.should_not have_received_message(:last).twice
+
+    expect(item).to_not have_received_message(:hello,"world")
+    expect(item).to_not have_received_message(:hello,"world")
+    expect(item).to have_received_message(:hello).twice
+    expect(item).to have_received_message(:hello)
+    expect(item).to_not have_received_message(:once_more)
+    expect(item).to_not have_received_message(:last,"hello")
+    expect(item).to have_received_message(:last,"other").once
+    expect(item).to_not have_received_message(:last).twice
   end
 
   it "should be able to determine if a call was made once" do
     item = fake
     item.hello
 
-    item.should have_received_message(:hello).once
+    expect(item).to have_received_message(:hello).once
   end
 
   it "should be able to determine if a call was made twice" do
@@ -40,7 +44,7 @@ describe "using the rspec extensions" do
     item.hello
     item.hello
 
-    item.should have_received_message(:hello).twice
+    expect(item).to have_received_message(:hello).twice
   end
 
   it "should be able to determine if a call was made at least once" do
@@ -48,7 +52,7 @@ describe "using the rspec extensions" do
     item.hello
     item.hello
 
-    item.should have_received_message(:hello).at_least_once
+    expect(item).to have_received_message(:hello).at_least_once
   end
 
   it "should be able to determine if a call was made at least twice" do
@@ -57,8 +61,8 @@ describe "using the rspec extensions" do
     item.hello
     item.hello
 
-    item.should have_received_message(:hello).at_least_twice
-    item.should have_received_message(:hello).at_least_twice
+    expect(item).to have_received_message(:hello).at_least_twice
+    expect(item).to have_received_message(:hello).at_least_twice
   end
   
   
@@ -68,8 +72,8 @@ describe "using the rspec extensions" do
     item.goodbye
     item.goodbye
 
-    item.should have_received_message(:hello).at_most_once
-    item.should_not have_received_message(:goodbye).at_most_once
+    expect(item).to have_received_message(:hello).at_most_once
+    expect(item).to_not have_received_message(:goodbye).at_most_once
   end
 
   it "should be able to determine if a call was made at most twice" do
@@ -79,8 +83,8 @@ describe "using the rspec extensions" do
     item.goodbye
     item.goodbye
 
-    item.should have_received_message(:hello).at_most_twice
-    item.should_not have_received_message(:goodbye).at_most_twice
+    expect(item).to have_received_message(:hello).at_most_twice
+    expect(item).to_not have_received_message(:goodbye).at_most_twice
   end
 
   it "should be able to determine if a call was made at least a specified number of times" do
@@ -90,22 +94,22 @@ describe "using the rspec extensions" do
     item.goodbye
     item.goodbye
 
-    item.should have_received_message(:hello).at_most(1)
-    item.should_not have_received_message(:goodbye).at_most(1)
+    expect(item).to have_received_message(:hello).at_most(1)
+    expect(item).to_not have_received_message(:goodbye).at_most(1)
   end
   context "using the arg matching style" do
     it "should be able to determing if a call was made using arg matchers" do
       item = fake
       item.hello("Yes")
 
-      item.should have_received_message(:hello,arg_match.any)
+      expect(item).to have_received_message(:hello,arg_match.any)
     end
 
     it "should be able to determing if a call was made using a combination of arg matchers and explicit values" do
       item = fake
       item.hello("Yes",2)
 
-      item.should have_received_message(:hello,arg_match.regex(/Y/),2)
+      expect(item).to have_received_message(:hello,arg_match.regex(/Y/),2)
     end
   end
   context "using class swapping" do
@@ -114,14 +118,14 @@ describe "using the rspec extensions" do
 
       Dir.stub(:exist?).and_return false
 
-      Dir.exist('/').should be_false
+      expect(Dir.exist('/')).to be_falsy
     end
 
     it "should be able to determing if a call was made using a combination of arg matchers and explicit values" do
       item = fake
       item.hello("Yes",2)
 
-      item.should have_received_message(:hello,arg_match.regex(/Y/),2)
+      expect(item).to have_received_message(:hello,arg_match.regex(/Y/),2)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fakes-rspec
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Develop With Passion®
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2015-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '3.0'
 description: Faking library that allows inspection of received calls after they have
   been made. Also supports tracking calls with multiple argument sets.
 email: