Merge pull request #1125 from thomas-holmes/support-rspec-3

Support rspec 3
This commit is contained in:
Jonas Nicklas 2013-08-08 15:48:07 -07:00
commit 8bdc7f6dc2
1 changed files with 7 additions and 0 deletions

View File

@ -7,6 +7,12 @@ require 'capybara/rspec/features'
RSpec.configure do |config|
config.include Capybara::DSL, :type => :feature
config.include Capybara::RSpecMatchers, :type => :feature
# A work-around to support accessing the current example that works in both
# RSpec 2 and RSpec 3.
fetch_current_example = RSpec.respond_to?(:current_example) ?
proc { RSpec.current_example } : proc { |context| context.example }
# The before and after blocks must run instantaneously, because Capybara
# might not actually be used in all examples where it's included.
config.after do
@ -17,6 +23,7 @@ RSpec.configure do |config|
end
config.before do
if self.class.include?(Capybara::DSL)
example = fetch_current_example.call(self)
Capybara.current_driver = Capybara.javascript_driver if example.metadata[:js]
Capybara.current_driver = example.metadata[:driver] if example.metadata[:driver]
end