Merge pull request #1110 from twalpole/iframe

Push nil scope when switching windows and frames to fix issue 1103

lib/capybara/session.rb

@@ -263,9 +263,12 @@ module Capybara
     #   @param [String] name           name of a frame
     #
     def within_frame(frame_handle)
+      scopes.push(nil)
       driver.within_frame(frame_handle) do
         yield
       end
+    ensure
+      scopes.pop
     end
 
     ##
@@ -276,7 +279,10 @@ module Capybara
     # @param [String] handle of the window
     #
     def within_window(handle, &blk)
+      scopes.push(nil)
       driver.within_window(handle, &blk)
+    ensure
+      scopes.pop
     end
 
     ##
@@ -383,7 +389,7 @@ module Capybara
     end
 
     def current_scope
-      scopes.last
+      scopes.last || document
     end
 
   private

lib/capybara/spec/session/within_frame_spec.rb

@@ -42,4 +42,11 @@ Capybara::SpecHelper.spec '#within_frame', :requires => [:frames] do
       end    
     end
   end
+  it "should reset scope when changing frames" do
+    @session.within(:css, '#divInMainWindow') do
+      @session.within_frame 'parentFrame' do
+        @session.has_selector?(:css, "iframe#childFrame").should be_true
+      end
+    end
+  end
 end

lib/capybara/spec/session/within_window_spec.rb

@@ -35,4 +35,11 @@ Capybara::SpecHelper.spec '#within_window', :requires => [:windows] do
     end
     @session.find("//*[@id='divInMainWindow']").text.should eql 'This is the text for divInMainWindow'
   end
+  it "should reset scope when switching windows" do
+    @session.within(:css, '#divInMainWindow') do
+      @session.within_window("secondPopup") do
+        @session.find("//*[@id='divInPopupTwo']").text.should eql 'This is the text of divInPopupTwo'
+      end
+    end
+  end
 end