From 11a19e64ec9395127333f1fea78c71264bec02b0 Mon Sep 17 00:00:00 2001
From: Lin Jen-Shin <godfat@godfat.org>
Date: Wed, 13 Jun 2018 20:20:36 +0800
Subject: Only clear the sessions if block_given? and no error

Because otherwise capybara-screenshot/rspec can't
take the screenshots for us. If we got an error,
we don't want to continue anyway?
---
 qa/qa/runtime/browser.rb | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'qa')

diff --git a/qa/qa/runtime/browser.rb b/qa/qa/runtime/browser.rb
index a12d95683af..ecd273c6db8 100644
--- a/qa/qa/runtime/browser.rb
+++ b/qa/qa/runtime/browser.rb
@@ -102,19 +102,7 @@ module QA
         def perform(&block)
           visit(url)
 
-          yield if block_given?
-        rescue
-          raise if block.nil?
-
-          # RSpec examples will take care of screenshots on their own
-          #
-          unless block.binding.receiver.is_a?(RSpec::Core::ExampleGroup)
-            screenshot_and_save_page
-          end
-
-          raise
-        ensure
-          clear! if block_given?
+          yield.tap { clear! } if block_given?
         end
 
         ##
-- 
cgit v1.2.1