capybara 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13e267dd4eab833671b7653e9cec855306653102
-  data.tar.gz: 80707daeb161eac1ac1cabff4edef7c06823b707
+  metadata.gz: 85d6a1e7f742859bc5336d455e804e941efbaffe
+  data.tar.gz: 9235385a6473080bb3ac0cae536857a054d323fc
 SHA512:
-  metadata.gz: 03a372cfdbdd251f39577df0b83bd8286af62cc4d02bdedd49d91594fb3c2de88babacf628366f49c3a8d10470203bccfe371e461f3789f8c7dae0be94d6eda2
-  data.tar.gz: 77db21ebef969917a1a8836d5d95e6a725f1fe6dc235fe0e795eeca25fd46b209f77487ddb5e38a523c80f7772ea6d17627ddabda78081e335e002847f8da53e
+  metadata.gz: 301575ccd96eb6a4239441886571377806d911f0de5868fc3891f052518199fef15424eba03429e8bf7e7ba5d1abba62e6953ba7a171a66ba2e3a325824806a8
+  data.tar.gz: 3339a52f863d7417eaedae85e8e556d5359f40a04f4c628dc883ddadd517a04d62c0f40b3a0d2d6cf2600842a6f3f1bb011d1df5fe88a977278273ae7055a417

data/History.md

@@ -1,5 +1,12 @@
+#Version 2.7.1
+Release date: 2016-05-01
+
+### 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: unreleased
+Release date: 2016-04-07
 
 ### Fixed
 * Element#visible?/checked?/disabled?/selected? Now return boolean

data/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!
 

data/lib/capybara/selenium/driver.rb

@@ -143,23 +143,16 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
   #
   def within_frame(frame_handle)
     frame_handle = frame_handle.native if frame_handle.is_a?(Capybara::Node::Base)
-    if !browser.switch_to.respond_to?(:parent_frame)
-      # Selenium Webdriver < 2.43 doesnt support moving back to the parent
-      @frame_handles[browser.window_handle] ||= []
-      @frame_handles[browser.window_handle] << frame_handle
-    end
+    @frame_handles[browser.window_handle] ||= []
+    @frame_handles[browser.window_handle] << frame_handle
     browser.switch_to.frame(frame_handle)
     yield
   ensure
-    if browser.switch_to.respond_to?(:parent_frame)
-      browser.switch_to.parent_frame
-    else
-      # There doesnt appear to be any way in Selenium Webdriver < 2.43 to move back to a parent frame
-      # other than going back to the root and then reiterating down
-      @frame_handles[browser.window_handle].pop
-      browser.switch_to.default_content
-      @frame_handles[browser.window_handle].each { |fh| browser.switch_to.frame(fh) }
-    end
+    # would love to use browser.switch_to.parent_frame here
+    # but it has an issue if the current frame is removed from within it
+    @frame_handles[browser.window_handle].pop
+    browser.switch_to.default_content
+    @frame_handles[browser.window_handle].each { |fh| browser.switch_to.frame(fh) }
   end
 
   def current_window_handle

data/lib/capybara/spec/session/within_frame_spec.rb

@@ -40,7 +40,7 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       @session.within_frame 'childFrame' do
         @session.within_frame 'grandchildFrame1' do end
         @session.within_frame 'grandchildFrame2' do end
-      end    
+      end
     end
   end
   it "should reset scope when changing frames" do
@@ -50,4 +50,14 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       end
     end
   end
+
+  it "works if the frame is closed", :requires => [:frames, :js] do
+    @session.within_frame 'parentFrame' do
+      @session.within_frame 'childFrame' do
+        @session.click_link 'Close Window'
+      end
+      expect(@session).to have_selector(:css, 'body#parentBody')
+      expect(@session).not_to have_selector(:css, '#childFrame')
+    end
+  end
 end

data/lib/capybara/spec/views/frame_child.erb

@@ -2,8 +2,15 @@
 <html>
     <head>
         <title>This is the child frame title</title>
+        <script>
+        function closeWin() {
+          var iframe = window.parent.document.getElementById('childFrame')
+          iframe.parentNode.removeChild(iframe)
+        }
+        </script>
     </head>
-    <body>
+    <body id="childBody">
+      <a href="javascript:void(0)" onClick="closeWin()">Close Window</a>
       <iframe src="/frame_one" id="grandchildFrame1"></iframe>
       <iframe src="/frame_two" id="grandchildFrame2"></iframe>
     </body>

data/lib/capybara/spec/views/frame_parent.erb

@@ -3,7 +3,7 @@
     <head>
         <title>This is the parent frame title</title>
     </head>
-    <body>
+    <body id="parentBody">
       <iframe src='/frame_child' id='childFrame'></iframe>
     </body>
 </html>

data/lib/capybara/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Capybara
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Thomas Walpole
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain:
 - gem-public_cert.pem
-date: 2016-04-07 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -419,7 +419,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Capybara aims to simplify the process of integration testing Rack applications,