From a47e19ef61f454d98a311a9f929429910e79b2af Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Fri, 29 Apr 2016 11:20:03 -0700
Subject: [PATCH] reset sessions in reverse order so sesessions with active
 servers are reset last

---
 History.md      | 1 +
 lib/capybara.rb | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/History.md b/History.md
index 2737def3..da09b991 100644
--- a/History.md
+++ b/History.md
@@ -11,6 +11,7 @@ Release date: Unreleased
 
 ### Fixed
 * Issue where within_Frame would fail with Selenium if the frame is removed from within itself [Thomas Walpole]
+* Reset sessions in reverse order so sessions with active servers are reset last - Issue #1692 [Jonas Nicklas, Thomas Walpole]
 
 # Version 2.7.0
 Release date: 2016-04-07
diff --git a/lib/capybara.rb b/lib/capybara.rb
index 808e5856..9e485313 100644
--- a/lib/capybara.rb
+++ b/lib/capybara.rb
@@ -327,7 +327,8 @@ module Capybara
     # as cookies.
     #
     def reset_sessions!
-      session_pool.each { |mode, session| session.reset! }
+      #reset in reverse so sessions that started servers are reset last
+      session_pool.reverse_each { |mode, session| session.reset! }
     end
     alias_method :reset!, :reset_sessions!