Merge pull request teamcapybara#969 from twalpole/within_frame

Test and fix for within_frame issue teamcapybara#686
aubinlrx · Feb 24, 2013 · b99650d · b99650d
2 parents d0008e8 + 63f2495
commit b99650d
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
@@ -27,6 +27,7 @@ def initialize(app, options={})
     @app = app
     @browser = nil
     @exit_status = nil
+    @frame_handles = {}
     @options = DEFAULT_OPTIONS.merge(options)
   end
 
@@ -94,12 +95,17 @@ def reset!
   #   @param [Capybara::Node::Base] a_node   frame element
   #
   def within_frame(frame_handle)
+    @frame_handles[browser.window_handle] ||= []
     frame_handle = frame_handle.native if frame_handle.is_a?(Capybara::Node::Base)
-    old_window = browser.window_handle
-    browser.switch_to.frame(frame_handle)
+    @frame_handles[browser.window_handle] << frame_handle
+    a=browser.switch_to.frame(frame_handle)
     yield
   ensure
-    browser.switch_to.window old_window
+    # There doesnt appear to be any way in Webdriver 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
 
   def find_window( selector )

diff --git a/lib/capybara/spec/session/within_frame_spec.rb b/lib/capybara/spec/session/within_frame_spec.rb
@@ -33,5 +33,13 @@
     @session.within_frame element do
       @session.find("//*[@id='divInFrameOne']").text.should eql 'This is the text of divInFrameOne'
     end
-  end  
+  end
+  it "should find multiple nested frames" do
+    @session.within_frame 'parentFrame' do
+      @session.within_frame 'childFrame' do
+        @session.within_frame 'grandchildFrame1' do end
+        @session.within_frame 'grandchildFrame2' do end
+      end    
+    end
+  end
 end
diff --git a/lib/capybara/spec/views/frame_child.erb b/lib/capybara/spec/views/frame_child.erb
@@ -0,0 +1,9 @@
+<html>
+    <head>
+        <title>This is the child frame title</title>
+    </head>
+    <body>
+      <iframe src="/frame_one" id="grandchildFrame1"></iframe>
+      <iframe src="/frame_two" id="grandchildFrame2"></iframe>
+    </body>
+</html>
diff --git a/lib/capybara/spec/views/frame_parent.erb b/lib/capybara/spec/views/frame_parent.erb
@@ -0,0 +1,8 @@
+<html>
+    <head>
+        <title>This is the parent frame title</title>
+    </head>
+    <body>
+      <iframe src='/frame_child' id='childFrame'>
+    </body>
+</html>
diff --git a/lib/capybara/spec/views/within_frames.erb b/lib/capybara/spec/views/within_frames.erb
@@ -6,5 +6,6 @@
         <div id="divInMainWindow">This is the text for divInMainWindow</div>
     <iframe src="/frame_one" id="frameOne"></iframe>
     <iframe src="/frame_two" id="frameTwo"></iframe>
+    <iframe src="/frame_parent" id="parentFrame"></iframe>
     </body>
 </html>