From 91004eca2633213b11d60cef12fd43961c414ef1 Mon Sep 17 00:00:00 2001 From: Carol Nichols Date: Fri, 19 Aug 2011 17:28:32 -0400 Subject: [PATCH] Making #using_driver specs clearer in light of the fix for issue #452 --- spec/dsl_spec.rb | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spec/dsl_spec.rb b/spec/dsl_spec.rb index 1fea4dd9..10b77e89 100644 --- a/spec/dsl_spec.rb +++ b/spec/dsl_spec.rb @@ -68,12 +68,20 @@ describe Capybara::DSL do driver.should == :selenium end - it 'should reset the driver using Capybara.use_default_driver, even if an exception occurs' do + it 'should return the driver to default if it has not been changed' do + Capybara.using_driver(:selenium) do + Capybara.current_driver.should == :selenium + end + Capybara.current_driver.should == Capybara.default_driver + end + + it 'should reset the driver even if an exception occurs' do + driver_before_block = Capybara.current_driver begin Capybara.using_driver(:selenium) { raise "ohnoes!" } rescue Exception end - Capybara.current_driver.should == Capybara.default_driver + Capybara.current_driver.should == driver_before_block end it 'should return the driver to what it was previously' do