Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Update for rspec-expectations compatibility.

  • Loading branch information...
commit 98be11508aabe449b915954813321904bf0f164e 1 parent 7616042
@wfarr authored
View
2  lib/rspec/rails/matchers/be_a_new.rb
@@ -1,6 +1,6 @@
module RSpec::Rails::Matchers
class BeANew
- include RSpec::Matchers::BaseMatcher
+ include RSpec::Matchers::BuiltIn::BaseMatcher
# @api private
def matches?(actual)
View
2  lib/rspec/rails/matchers/be_new_record.rb
@@ -1,6 +1,6 @@
module RSpec::Rails::Matchers
class BeANewRecord
- include RSpec::Matchers::BaseMatcher
+ include RSpec::Matchers::BuiltIn::BaseMatcher
# @api private
def matches?(actual)
View
4 lib/rspec/rails/matchers/have_extension.rb
@@ -1,5 +1,5 @@
require 'active_support/core_ext/module/aliasing'
-require 'rspec/matchers/have'
+require 'rspec/matchers/built_in/have'
module RSpec::Rails::Matchers
module HaveExtensions
@@ -30,6 +30,6 @@ def description_with_errors_on_extensions
end
end
-RSpec::Matchers::Have.class_eval do
+RSpec::Matchers::BuiltIn::Have.class_eval do
include RSpec::Rails::Matchers::HaveExtensions
end
View
2  lib/rspec/rails/matchers/redirect_to.rb
@@ -1,7 +1,7 @@
module RSpec::Rails::Matchers
module RedirectTo
class RedirectTo
- include RSpec::Matchers::BaseMatcher
+ include RSpec::Matchers::BuiltIn::BaseMatcher
def initialize(scope, expected)
super(expected)
View
2  lib/rspec/rails/matchers/relation_match_array.rb
@@ -1,3 +1,3 @@
if defined?(ActiveRecord::Relation)
- RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::MatchArray)
+ RSpec::Matchers::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
end
View
2  lib/rspec/rails/matchers/render_template.rb
@@ -1,7 +1,7 @@
module RSpec::Rails::Matchers
module RenderTemplate
class RenderTemplateMatcher
- include RSpec::Matchers::BaseMatcher
+ include RSpec::Matchers::BuiltIn::BaseMatcher
def initialize(scope, expected, message=nil)
super(Symbol === expected ? expected.to_s : expected)
View
4 lib/rspec/rails/matchers/routing_matchers.rb
@@ -3,7 +3,7 @@ module RoutingMatchers
extend RSpec::Matchers::DSL
class RouteToMatcher
- include RSpec::Matchers::BaseMatcher
+ include RSpec::Matchers::BuiltIn::BaseMatcher
def initialize(scope, *expected)
@scope = scope
@@ -52,7 +52,7 @@ def route_to(*expected)
end
class BeRoutableMatcher
- include RSpec::Matchers::BaseMatcher
+ include RSpec::Matchers::BuiltIn::BaseMatcher
def initialize(scope)
@scope = scope
Please sign in to comment.
Something went wrong with that request. Please try again.