Permalink
Browse files

Merge pull request #144 from twobitlabs/master

Fix TeamCity incompatibility
  • Loading branch information...
2 parents ae3f0ea + c5af8f3 commit 8585a5d0e9ef75fb0f000739e1b75ca9b1a929d7 @bblimke committed Jan 4, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/webmock/rspec.rb
View
@@ -3,7 +3,7 @@
# RSpec 1.x and 2.x compatibility
if defined?(RSpec) && defined?(RSpec::Expectations)
RSPEC_NAMESPACE = RSPEC_CONFIGURER = RSpec
-elsif defined?(Spec)
+elsif defined?(Spec) && defined?(Spec.configure)
RSPEC_NAMESPACE = Spec
RSPEC_CONFIGURER = Spec::Runner
else

0 comments on commit 8585a5d

Please sign in to comment.