expectations 1.2.0 → 1.2.1

data/README

@@ -45,17 +45,17 @@ expectations can be used for state based and behavior based testing.
 	require File.dirname(__FILE__) + "/test_helper"
 	
 	Expectations do
-	  
+	
 	  # State based expectation where a value equals another value
 	  expect 2 do
 	    1 + 1
 	  end
-	  
+	
 	  # State based expectation where an exception is expected. Simply expect the Class of the intended exception
 	  expect NoMethodError do
 	    Object.no_method
 	  end
-	  
+	
 	  # Behavior based test using a traditional mock
 	  expect mock.to.receive(:dial).with("2125551212").times(2) do |phone|
 	    phone.dial("2125551212")
@@ -78,34 +78,22 @@ expectations can be used for state based and behavior based testing.
 	  expect Object.to.receive(:deal) do
 	    Object.deal
 	  end
-	  
+	
 	  # State based test utilizing a stub
 	  expect 2 do
 	    stub(:two => 2).two
 	  end
-	  
-	  # State based test utilizing a concrete mock
-	  expect 2 do
-	    Object.expects(:bar).returns 2
-	    Object.bar
-	  end
-	  
-	  # Behavior based test utilizing a stub and a concrete mock
-	  expect 1 do
-	    Object.expects(:give_me_three).with(3).returns 1
-	    Object.give_me_three(stub(:three=>3).three)
-	  end
-	  
+	
 	  # State based test matching a Regexp
 	  expect /a string/ do
 	    "a string"
 	  end
-	  
+	
 	  # State based test checking if actual is in the expected Range
 	  expect 1..5 do
 	    3
 	  end
-	  
+	
 	  # State based test to determine if the object is an instance of the module
 	  expect Enumerable do
 	    []
@@ -115,33 +103,33 @@ expectations can be used for state based and behavior based testing.
 	  expect String do
 	    "a string"
 	  end
-	  
+	
 	  # State based test to determine if the modules are the same
 	  expect Enumerable do
 	    Enumerable
 	  end
-	  
+	
 	  # State based test to determine if the classes are the same
 	  expect String do
 	    String
 	  end
-	  
+	
 	  # State based test with XML strings, whitespace between tags is ignored
 	  expect xml("<a><foo>bar</foo></a>") do
 	    "<a>\n\t<foo>bar</foo>  \n</a>"
 	  end
-	  
+	
 	  # State based test with XML strings, whitespace between tags is ignored
 	  expect xml(<<-eos) do
 	    <one>
-	      <two>
-	        <three>4</three>
-	        <five> 6 </five>
-	      </two>
+	    <two>
+	    <three>4</three>
+	    <five> 6 </five>
+	    </two>
 	    </one>
 	    eos
 	    "<one><two><three>4</three>
-	      <five> 6 </five>
+	    <five> 6 </five>
 	    </two></one>"
 	  end
 	
@@ -155,7 +143,7 @@ expectations can be used for state based and behavior based testing.
 	  expect klass.new.to.delegate(:save).to(:record) do |instance|
 	    instance.save(1)
 	  end
-	  
+	
 	  # this is normally defined in the file specific to the class
 	  klass = Class.new do
 	    attr_accessor :started
@@ -164,7 +152,7 @@ expectations can be used for state based and behavior based testing.
 	  expect klass.new.to.be.started do |process|
 	    process.started = true
 	  end
-	  
+	
 	  # this is normally defined in the file specific to the class
 	  klass = Class.new do
 	    attr_accessor :finished
@@ -173,9 +161,12 @@ expectations can be used for state based and behavior based testing.
 	  expect klass.new.to.have.finished do |process|
 	    process.finished = true
 	  end
-	  
+	
+	  expect nil.to.be.nil?
+	  expect Object.not.to.be.nil?
+	
 	end
 
 == Contributors
 
-Matt Mower, Ola Bini, George Malamidis, Brian Guthrie, Philippe Hanrigou, Steve McLarnon, Rubikitch
+Matt Mower, Ola Bini, George Malamidis, Brian Guthrie, Philippe Hanrigou, Steve McLarnon, Rubikitch, Subhash Gupta, Holger Kohnen

data/lib/expectations/recorded_expectation.rb

@@ -6,6 +6,10 @@ module Expectations::RecordedExpectation
       warn_for_expects do
         instance_exec(expected.subject, &block) if block
       end
+      if expected.subject.is_a?(Mocha::Mock) &&
+          !Mocha::Mockery.instance.mocks.include?(expected.subject)
+        Mocha::Mockery.instance.__send__(:add_mock, expected.subject)
+      end
       if expected.verify! && mocha_verify
         self.extend(Expectations::Results::Fulfilled)
       else

data/rakefile.rb

@@ -26,7 +26,6 @@ task :readme do
   %x[erb README_TEMPLATE > README]
 end
 
-
 desc "Upload RDoc to RubyForge"
 task :publish_rdoc do
   Rake::Task[:readme].invoke
@@ -34,8 +33,6 @@ task :publish_rdoc do
   Rake::SshDirPublisher.new("jaycfields@rubyforge.org", "/var/www/gforge-projects/expectations", "doc").upload
 end
 
-Gem::manage_gems
-
 specification = Gem::Specification.new do |s|
   s.name   = "expectations"
   s.summary = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
@@ -46,7 +43,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-  s.version = "1.2.0"
+  s.version = "1.2.1"
   s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 

data/test/expectations/suite_test.rb

@@ -20,6 +20,15 @@ Expectations do
     suite.execute(Silent).succeeded?
   end
   
+  expect false do
+    suite = Expectations::Suite.new
+    suite.expect(true) { true }
+    suite.expect suite.mock.to.receive(:some_method) do |some_mock|
+      # some_method is not called
+    end
+    suite.execute(Silent).succeeded?
+  end
+  
   expect Mocha::Mock do
     Expectations::Suite.new.mock
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-28 00:00:00 +01:00
+date: 2009-04-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
+  type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
@@ -30,43 +31,43 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- lib/expectations.rb
+- lib/expectations/range.rb
+- lib/expectations/reverse_result.rb
 - lib/expectations/blank_slate.rb
-- lib/expectations/delegate_recorder.rb
-- lib/expectations/expectation.rb
-- lib/expectations/mock_recorder.rb
-- lib/expectations/module.rb
 - lib/expectations/object.rb
-- lib/expectations/range.rb
-- lib/expectations/recorded_expectation.rb
-- lib/expectations/recorder.rb
-- lib/expectations/regexp.rb
+- lib/expectations/mock_recorder.rb
+- lib/expectations/suite_runner.rb
 - lib/expectations/results.rb
-- lib/expectations/reverse_result.rb
-- lib/expectations/standard_error.rb
-- lib/expectations/state_based_expectation.rb
-- lib/expectations/state_based_recorder.rb
-- lib/expectations/string.rb
+- lib/expectations/xml_string.rb
+- lib/expectations/expectation.rb
 - lib/expectations/suite.rb
+- lib/expectations/state_based_recorder.rb
+- lib/expectations/state_based_expectation.rb
+- lib/expectations/recorded_expectation.rb
+- lib/expectations/standard_error.rb
 - lib/expectations/suite_results.rb
-- lib/expectations/suite_runner.rb
-- lib/expectations/xml_string.rb
-- lib/expectations.rb
+- lib/expectations/recorder.rb
+- lib/expectations/delegate_recorder.rb
+- lib/expectations/module.rb
+- lib/expectations/string.rb
+- lib/expectations/regexp.rb
+- test/failures_test.rb
+- test/silent.rb
+- test/test_helper.rb
+- test/successes_test.rb
+- test/expectations/regexp_test.rb
+- test/expectations/suite_runner_test.rb
 - test/expectations/expectation_test.rb
-- test/expectations/expectations_test.rb
-- test/expectations/module_test.rb
+- test/expectations/string_test.rb
 - test/expectations/object_test.rb
+- test/expectations/expectations_test.rb
+- test/expectations/xml_string_test.rb
 - test/expectations/range_test.rb
-- test/expectations/regexp_test.rb
-- test/expectations/results_test.rb
-- test/expectations/string_test.rb
-- test/expectations/suite_results_test.rb
-- test/expectations/suite_runner_test.rb
 - test/expectations/suite_test.rb
-- test/expectations/xml_string_test.rb
-- test/failures_test.rb
-- test/silent.rb
-- test/successes_test.rb
-- test/test_helper.rb
+- test/expectations/suite_results_test.rb
+- test/expectations/results_test.rb
+- test/expectations/module_test.rb
 - rakefile.rb
 - README
 has_rdoc: true
@@ -95,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: expectations
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: A lightweight unit testing framework. Tests (expectations) will be written as follows  expect 2 do  1 + 1  end   expect NoMethodError do  Object.invalid_method_call  end.