hardmock 1.3.4 → 1.3.5

data/CHANGES

@@ -1,3 +1,7 @@
+Hardmock 1.3.5
+
+* Aliased should_receive => expects and and_return => returns for easier transition from rspec mock and flexmock users.
+
 Hardmock 1.3.4
 
 * Prevents accidental stubbing and mocking on NilClasses

data/Rakefile

@@ -1,7 +1,7 @@
 require 'rake'
 require 'rubygems'
 
-HARDMOCK_VERSION = "1.3.4"
+HARDMOCK_VERSION = "1.3.5"
 
 Dir["rake_tasks/*.rake"].each { |f| load f }
 

data/lib/hardmock.rb

@@ -9,6 +9,7 @@ require 'hardmock/expectation'
 require 'hardmock/expectation_builder'
 require 'hardmock/stubbing'
 
+
 module Hardmock
 
   # Setup auto mock verification on teardown, being careful not to interfere

data/lib/hardmock/expectation.rb

@@ -64,6 +64,7 @@ module Hardmock
       @options[:returns] = val
       self
     end
+    alias_method :and_return, :returns
     
     # Set the arguments for an expected method call.
     # Eg,

data/lib/hardmock/mock.rb

@@ -113,9 +113,7 @@ module Hardmock
       expector.send(args.shift.to_sym, *args, &block)
     end
     alias_method :expect, :expects
-#    def expect(*args, &block) #:nodoc:
-#      raise DeprecationError.new("Please use 'expects' instead of 'expect'.  Sorry about the inconvenience.")
-#    end
+    alias_method :should_receive, :expects
 
     # 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/test/functional/hardmock_test.rb

@@ -341,6 +341,20 @@ class HardmockTest < Test::Unit::TestCase
     verify_mocks 
   end
 
+  it "provides 'should_receive' as an alias for 'expects'" do
+    create_mock :foo
+    @foo.should_receive.boomboom
+    @foo.boomboom
+    verify_mocks 
+  end
+
+  it "provides 'and_return' as an alias for 'returns'" do
+    create_mock :foo
+    @foo.expects(:boomboom).and_return :brick
+    assert_equal :brick, @foo.boomboom
+    verify_mocks 
+  end
+
   it "does not interfere with a core subset of Object methods" do 
     create_mock :foo
     @foo.method(:inspect)

metadata

@@ -1,30 +1,36 @@
 --- !ruby/object:Gem::Specification 
+rubygems_version: 0.9.0
+specification_version: 1
 name: hardmock
 version: !ruby/object:Gem::Version 
-  version: 1.3.4
+  version: 1.3.5
+date: 2007-12-10 00:00:00 -05:00
+summary: A strict, ordered, expectation-oriented mock object library.
+require_paths: 
+- lib
+email: crosby@atomicobject.com
+homepage: http://hardmock.rubyforge.org
+rubyforge_project: hardmock
+description: 
+autorequire: hardmock
+default_executable: 
+bindir: bin
+has_rdoc: true
+required_ruby_version: !ruby/object:Gem::Version::Requirement 
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      version: 0.0.0
+  version: 
 platform: ruby
+signing_key: 
+cert_chain: 
+post_install_message: 
 authors: 
 - David Crosby
-autorequire: hardmock
-bindir: bin
-cert_chain: []
-
-date: 2007-12-06 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
-description: 
-email: crosby@atomicobject.com
-executables: []
-
-extensions: []
-
-extra_rdoc_files: 
-- README
-- CHANGES
-- LICENSE
 files: 
 - lib/assert_error.rb
+- lib/hardmock.rb
 - lib/hardmock/errors.rb
 - lib/hardmock/expectation.rb
 - lib/hardmock/expectation_builder.rb
@@ -35,13 +41,12 @@ files:
 - lib/hardmock/stubbing.rb
 - lib/hardmock/trapper.rb
 - lib/hardmock/utils.rb
-- lib/hardmock.rb
+- test/test_helper.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/functional/stubbing_test.rb
-- test/test_helper.rb
 - test/unit/expectation_builder_test.rb
 - test/unit/expectation_test.rb
 - test/unit/expector_test.rb
@@ -58,37 +63,6 @@ files:
 - README
 - CHANGES
 - LICENSE
-has_rdoc: true
-homepage: http://hardmock.rubyforge.org
-post_install_message: 
-rdoc_options: 
-- --line-numbers
-- --inline-source
-- --main
-- README
-- --title
-- Hardmock
-require_paths: 
-- lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-requirements: []
-
-rubyforge_project: hardmock
-rubygems_version: 0.9.5
-signing_key: 
-specification_version: 2
-summary: A strict, ordered, expectation-oriented mock object library.
 test_files: 
 - test/functional/assert_error_test.rb
 - test/functional/auto_verify_test.rb
@@ -103,3 +77,22 @@ test_files:
 - test/unit/mock_test.rb
 - test/unit/trapper_test.rb
 - test/unit/verify_error_test.rb
+rdoc_options: 
+- --line-numbers
+- --inline-source
+- --main
+- README
+- --title
+- Hardmock
+extra_rdoc_files: 
+- README
+- CHANGES
+- LICENSE
+executables: []
+
+extensions: []
+
+requirements: []
+
+dependencies: []
+