diff --git a/lib/rspec/rails/example/controller_example_group.rb b/lib/rspec/rails/example/controller_example_group.rb index 965386be02..e385a05e46 100644 --- a/lib/rspec/rails/example/controller_example_group.rb +++ b/lib/rspec/rails/example/controller_example_group.rb @@ -14,7 +14,7 @@ module ControllerExampleGroupBehaviour include ActionDispatch::Integration::Runner include Webrat::Matchers include Webrat::Methods - include Rspec::Rails::Matchers + include Rspec::Matchers def self.setup(*args); end def self.teardown(*args); end diff --git a/lib/rspec/rails/example/request_example_group.rb b/lib/rspec/rails/example/request_example_group.rb index bd3856cb6c..e2d622d34c 100644 --- a/lib/rspec/rails/example/request_example_group.rb +++ b/lib/rspec/rails/example/request_example_group.rb @@ -6,7 +6,7 @@ module RequestExampleGroupBehaviour include ActionDispatch::Integration::Runner include Webrat::Matchers include Webrat::Methods - include Rspec::Rails::Matchers + include Rspec::Matchers def self.included(mod) mod.before do diff --git a/lib/rspec/rails/matchers.rb b/lib/rspec/rails/matchers.rb index a5671e6f68..ec66c9230b 100644 --- a/lib/rspec/rails/matchers.rb +++ b/lib/rspec/rails/matchers.rb @@ -11,30 +11,15 @@ class AssertionFailedError < StandardError end end -module Rspec - module Rails - module Matchers - include Rspec::Matchers - - def redirect_to(destination) - running_example = self - Matcher.new :redirect_to, destination do |destination_| - match_unless_raises Test::Unit::AssertionFailedError do |_| - running_example.assert_redirected_to destination_ - end - end - end - - def render_template(options={}, message=nil) - running_example = self - Matcher.new :render_template, options, message do |options_, message_| - match_unless_raises Test::Unit::AssertionFailedError do |_| - running_example.assert_template options_, message_ - end - end - end +Rspec::Matchers.define :redirect_to do |destination| + match_unless_raises Test::Unit::AssertionFailedError do |_| + assert_redirected_to destination + end +end - end +Rspec::Matchers.define :render_template do |options, message| + match_unless_raises Test::Unit::AssertionFailedError do |_| + assert_template options, message end end