From 8650fe1ff3dd24bf121a5a233e03b59d2b7a2af4 Mon Sep 17 00:00:00 2001 From: Matthew Horan Date: Wed, 28 Nov 2012 21:06:04 -0500 Subject: [PATCH] Don't reset the browser unnecessarily The Capybara spec_helper already resets the browser after each spec, so we only need to reset after using the driver via AppRunner. --- spec/spec_helper.rb | 4 ---- spec/support/app_runner.rb | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 9299cf2..d7184a2 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -29,10 +29,6 @@ if ENV['DEBUG'] $webkit_browser.enable_logging end -RSpec.configure do |config| - config.before { $webkit_browser.reset! } -end - require File.join(spec_dir, "spec_helper") Capybara.register_driver :reusable_webkit do |app| diff --git a/spec/support/app_runner.rb b/spec/support/app_runner.rb index 43a3807..3e35658 100644 --- a/spec/support/app_runner.rb +++ b/spec/support/app_runner.rb @@ -51,6 +51,7 @@ module AppRunner def self.included(example_group) example_group.class_eval do before { AppRunner.reset } + after { $webkit_browser.reset! } end end end