Merge pull request #104 from machinio/frames

Conform ferrum frames

Author: route

lib/capybara/cuprite/driver.rb

@@ -50,7 +50,7 @@ def current_url
     end
 
     def frame_url
-      browser.frame_url
+      evaluate_script("window.location.href")
     end
 
     def html
@@ -71,7 +71,7 @@ def title
     end
 
     def frame_title
-      browser.frame_title
+      evaluate_script("document.title")
     end
 
     def find_xpath(selector)

lib/capybara/cuprite/page.rb

@@ -1,13 +1,22 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 module Capybara::Cuprite
   module Page
     MODAL_WAIT = ENV.fetch("CUPRITE_MODAL_WAIT", 0.05).to_f
 
+    extend Forwardable
+    delegate %i[at_css at_xpath css xpath
+                current_url current_title body
+                execution_id evaluate evaluate_on evaluate_async execute] => :active_frame
+
+
     def initialize(*args)
-      super
+      @frame_stack = []
       @accept_modal = []
       @modal_messages = []
+      super
     end
 
     def set(node, value)
@@ -104,6 +113,10 @@ def switch_to_frame(handle)
       end
     end
 
+    def title
+      active_frame.current_title
+    end
+
     private
 
     def prepare_page
@@ -162,5 +175,13 @@ def find_position(node, *args)
         raise
       end
     end
+
+    def active_frame
+      if @frame_stack.empty?
+        main_frame
+      else
+        @frames[@frame_stack.last]
+      end
+    end
   end
 end