Merge pull request #421 from amc-projects/master

Compatibility fix for rspec-instafail and rspec1
2011-07-23 14:46:37 -07:00 · 2011-07-23 14:46:37 -07:00 · 987dce0dc2
commit 987dce0dc2
parent e0492f5d75 3b33b36de9
1 changed files with 2 additions and 2 deletions
--- a/lib/cancan/matchers.rb
+++ b/lib/cancan/matchers.rb
@ -1,5 +1,5 @@
-RSpec = Spec unless defined? RSpec # for RSpec 1 compatability
-RSpec::Matchers.define :be_able_to do |*args|
+rspec_module = defined?(RSpec::Core) ? 'RSpec' : 'Spec'  # for RSpec 1 compatability
+Kernel.const_get(rspec_module)::Matchers.define :be_able_to do |*args|
  match do |ability|
    ability.can?(*args)
  end