Merge branch 'master' of https://github.com/bjornblomqvist/capybara into bjornblomqvist-master

This commit is contained in:
Jonas Nicklas and Kim Burgestrand 2011-11-15 16:15:02 +01:00
commit 87f470ed2f
1 changed files with 2 additions and 5 deletions

View File

@ -6,8 +6,9 @@ require 'capybara/rspec/matchers'
World(Capybara::DSL)
World(Capybara::RSpecMatchers)
After do
Before do
Capybara.reset_sessions!
Capybara.use_default_driver
end
Before '@javascript' do
@ -22,7 +23,3 @@ Before do |scenario|
end
end
end
After do
Capybara.use_default_driver
end