hardmock 1.1.0 → 1.2.0

data/Rakefile

@@ -4,8 +4,9 @@ require 'rake/rdoctask'
 require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/contrib/sshpublisher'
+require 'hoe'
 
-HARDMOCK_VERSION = "1.1.0"
+HARDMOCK_VERSION = "1.2.0"
 
 task :default => [ :alltests ]
 
@@ -39,6 +40,8 @@ task :upload_doc => :rerdoc do
   sh "scp -r homepage/* rubyforge.org:/var/www/gforge-projects/hardmock/"
 end
 
+
+
 gem_spec = Gem::Specification.new do | s |
   s.name = "hardmock"
   s.version = HARDMOCK_VERSION
@@ -49,7 +52,6 @@ gem_spec = Gem::Specification.new do | s |
   s.rubyforge_project = 'hardmock'
   s.homepage = "http://hardmock.rubyforge.org"
   s.autorequire =  'hardmock'
-  
 
   s.files = FileList['{lib,test}/**/*.rb', '[A-Z]*'].exclude('TODO').to_a
 
@@ -58,7 +60,6 @@ gem_spec = Gem::Specification.new do | s |
 
   s.has_rdoc = true
   s.extra_rdoc_files = ["README","CHANGES","LICENSE"]
-#  s.rdoc_options << '--title' << 'Harmock' << '--main' << 'README' << '--line-numbers'
   add_rdoc_options(s.rdoc_options)
 end
 

data/lib/hardmock.rb

@@ -209,10 +209,10 @@ module Hardmock
       # If there ARE args, we set up the expectation right here and return it
       expector.send(args.shift.to_sym, *args, &block)
     end
-
-    def expect(*args, &block) #:nodoc:
-      raise DeprecationError.new("Please use 'expects' instead of 'expect'.  Sorry about the inconvenience.")
-    end
+    alias_method :expect, :expects
+#    def expect(*args, &block) #:nodoc:
+#      raise DeprecationError.new("Please use 'expects' instead of 'expect'.  Sorry about the inconvenience.")
+#    end
 
     # Special-case convenience: #trap sets up an expectation for a method
     # that will take a block.  That block, when sent to the expected method, will

data/lib/method_cleanout.rb

@@ -1,7 +1,7 @@
 
 module Hardmock #:nodoc:
   module MethodCleanout #:nodoc:
-    SACRED_METHODS = %w|__id__ __send__ equal? object_id send nil? class kind_of? respond_to?|
+    SACRED_METHODS = %w|__id__ __send__ equal? object_id send nil? class kind_of? respond_to? inspect|
 
     def self.included(base) #:nodoc:
       base.class_eval do

data/test/functional/hardmock_test.rb

@@ -351,15 +351,8 @@ class HardmockTest < Test::Unit::TestCase
 		assert_equal false, @car.ignition_on?, "Should be false"
 	end
 
-  def test_should_raise_deprecation_error_when_old_expect_called
-    create_mock :foo
-    assert_error Hardmock::DeprecationError, /expect/,/expects/,/instead of/,/sorry/i do
-      @foo.expect.something
-    end
-  end
-
   def test_should_be_able_to_mock_methods_inherited_from_object
-    target_methods = %w|to_s inspect instance_eval instance_variables id clone display dup eql? ==|
+    target_methods = %w|to_s instance_eval instance_variables id clone display dup eql? ==|
     create_mock :foo
     target_methods.each do |m|
       eval %{@foo.expects(m, "some stuff")}
@@ -367,5 +360,12 @@ class HardmockTest < Test::Unit::TestCase
     end
   end
 
+  def test_should_support_expect_and_should_receive_as_aliases_for_expects 
+    create_mock :foo
+    @foo.expect.boomboom
+    @foo.boomboom
+    verify_mocks 
+  end
+
 end
 

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: hardmock
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-12-10 00:00:00 -05:00
+  version: 1.2.0
+date: 2006-12-19 00:00:00 -05:00
 summary: A strict, ordered, expectation-oriented mock object library.
 require_paths: 
 - lib
@@ -25,41 +25,42 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - David Crosby
 files: 
 - lib/hardmock.rb
 - lib/method_cleanout.rb
 - test/test_helper.rb
-- test/unit/verify_error_test.rb
-- test/unit/mock_test.rb
+- test/functional/assert_error_test.rb
+- test/functional/auto_verify_test.rb
+- test/functional/direct_mock_usage_test.rb
+- test/functional/hardmock_test.rb
+- test/unit/expectation_builder_test.rb
+- test/unit/expector_test.rb
 - test/unit/method_cleanout_test.rb
-- test/unit/trapper_test.rb
 - test/unit/mock_control_test.rb
-- test/unit/expector_test.rb
+- test/unit/mock_test.rb
 - test/unit/simple_expectation_test.rb
-- test/unit/expectation_builder_test.rb
-- test/functional/direct_mock_usage_test.rb
-- test/functional/hardmock_test.rb
-- test/functional/assert_error_test.rb
-- test/functional/auto_verify_test.rb
+- test/unit/trapper_test.rb
+- test/unit/verify_error_test.rb
+- CHANGES
 - LICENSE
 - Rakefile
 - README
-- CHANGES
 test_files: 
-- test/unit/verify_error_test.rb
-- test/unit/mock_test.rb
+- test/functional/assert_error_test.rb
+- test/functional/auto_verify_test.rb
+- test/functional/direct_mock_usage_test.rb
+- test/functional/hardmock_test.rb
+- test/unit/expectation_builder_test.rb
+- test/unit/expector_test.rb
 - test/unit/method_cleanout_test.rb
-- test/unit/trapper_test.rb
 - test/unit/mock_control_test.rb
-- test/unit/expector_test.rb
+- test/unit/mock_test.rb
 - test/unit/simple_expectation_test.rb
-- test/unit/expectation_builder_test.rb
-- test/functional/direct_mock_usage_test.rb
-- test/functional/hardmock_test.rb
-- test/functional/assert_error_test.rb
-- test/functional/auto_verify_test.rb
+- test/unit/trapper_test.rb
+- test/unit/verify_error_test.rb
 rdoc_options: 
 - --line-numbers
 - --inline-source