Permalink
Browse files

delegate instead of alias from mocha adapter

  • Loading branch information...
1 parent b5354ef commit 2c60898732a47172762460107eb240458f19aa31 @dchelimsky dchelimsky committed Feb 10, 2012
Showing with 11 additions and 4 deletions.
  1. +1 −0 Changelog.md
  2. +10 −4 lib/rspec/core/mocking/with_mocha.rb
View
@@ -25,6 +25,7 @@ Bug fixes
the user got no feedback about what happened. (Myron Marston)
* `--require` and `-I` are merged among different configuration sources (Andy
Lindeman)
+* Delegate to mocha methods instead of aliasing them in mocha adapter.
### 2.10.1 / 2012-05-19
[full changelog](http://github.com/rspec/rspec-core/compare/v2.10.0...v2.10.1)
@@ -4,7 +4,6 @@
module RSpec
module Core
module MockFrameworkAdapter
-
def self.framework_name; :mocha end
# Mocha::Standalone was deprecated as of Mocha 0.9.7.
@@ -14,10 +13,17 @@ def self.framework_name; :mocha end
include Mocha::Standalone
end
- alias :setup_mocks_for_rspec :mocha_setup
- alias :verify_mocks_for_rspec :mocha_verify
- alias :teardown_mocks_for_rspec :mocha_teardown
+ def setup_mocks_for_rspec
+ mocha_setup
+ end
+
+ def verify_mocks_for_rspec
+ mocha_verify
+ end
+ def teardown_mocks_for_rspec
+ mocha_teardown
+ end
end
end
end

0 comments on commit 2c60898

Please sign in to comment.