cuprite 0.7.1 → 0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61e6eae56b712430083dd1dc25ae7888016899b9504fcb2795525fe2df0d9b63
-  data.tar.gz: 26f55efb799bff8ffa704fd1955dc01b03c11db3f44806f3a1c8284d84237ae8
+  metadata.gz: dcb46f5716c12a1a33acb66d1e7827897f1331447806f52379571226ac4dfe9c
+  data.tar.gz: 8ca919e8ebdfef7a4a16613b0c0620084365d3231dbbe5b7d96bc18bf0f1cf9a
 SHA512:
-  metadata.gz: a8eb4c7caeeaf86f24ebef9bf37edf6bf3e6ccf474633be8c69a1b4296abfcb5df040ede0c5feccecc930393312408800a928f3671aeb658a7d5beadb08a3c0a
-  data.tar.gz: 44387ad8fa9b9a87a236d2df3d754155ad4ed280348d65da2479b1a5a08e6be215ebf2ad652c1159188f08f6f231fbeeeddd2ce767d5bc9a53b1c0e7f39fbdf1
+  metadata.gz: a3451efdac94c66d55d8afb49ee5497a91c48d7b2b9b0e9728b49f9c44ad4fa7c5d780a81ec7a4650f9a35a2370846b7da5782e9c6867cd0774d3204509e085a
+  data.tar.gz: 6e33306c0157a88640d5b546faddef248576208eca188fe4898ff898023717a2439a138dbdfe98670b6cae4b03a5b81cce2b5eaa93d73c2f266f6761bd72603d

data/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Machinio
+Copyright (c) 2018-2019 Machinio
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/lib/capybara/cuprite/browser.rb

@@ -6,7 +6,6 @@ module Capybara::Cuprite
   class Browser < Ferrum::Browser
     extend Forwardable
 
-    delegate %i[find_or_create_page] => :targets
     delegate %i[send_keys select set hover trigger before_click switch_to_frame
                 find_modal accept_confirm dismiss_confirm accept_prompt
                 dismiss_prompt reset_modals] => :page
@@ -19,6 +18,22 @@ module Capybara::Cuprite
       self.url_whitelist = options[:url_whitelist]
 
       super
+      @page = false
+    end
+
+    def page
+      raise Ferrum::NoSuchPageError if @page.nil?
+      @page ||= default_context.page
+    end
+
+    def reset
+      super
+      @page = default_context.page
+    end
+
+    def quit
+      super
+      @page = false
     end
 
     def url_whitelist=(patterns)
@@ -53,16 +68,46 @@ module Capybara::Cuprite
       find_all(method, selector, { "objectId" => object_id })
     end
 
+    def window_handle
+      page.target_id
+    end
+
+    def window_handles
+      targets.keys
+    end
+
     def within_window(locator = nil, &block)
+      original = window_handle
+
       if Capybara::VERSION.to_f < 3.0
         target_id = window_handles.find do |target_id|
-          page = find_or_create_page(target_id)
+          page = targets[target_id].page
           locator == page.frame_name
         end
         locator = target_id if target_id
       end
 
-      targets.within_window(locator, &block)
+      if window_handles.include?(locator)
+        switch_to_window(locator)
+        yield
+      else
+        raise Ferrum::NoSuchPageError
+      end
+    ensure
+      switch_to_window(original)
+    end
+
+    def switch_to_window(target_id)
+      target = targets[target_id]
+      raise Ferrum::NoSuchPageError unless target
+      @page = target.page
+    end
+
+    def close_window(target_id)
+      target = targets[target_id]
+      raise Ferrum::NoSuchPageError unless target
+      @page = nil if @page == target.page
+      target.page.close
     end
 
     def browser_error

data/lib/capybara/cuprite/driver.rb

@@ -50,7 +50,7 @@ module Capybara::Cuprite
     end
 
     def frame_url
-      browser.frame_url
+      evaluate_script("window.location.href")
     end
 
     def html
@@ -71,7 +71,7 @@ module Capybara::Cuprite
     end
 
     def frame_title
-      browser.frame_title
+      evaluate_script("document.title")
     end
 
     def find_xpath(selector)
@@ -129,7 +129,7 @@ module Capybara::Cuprite
     end
 
     def open_new_window
-      browser.open_new_window
+      browser.create_page
     end
 
     def switch_to_window(handle)
@@ -141,7 +141,7 @@ module Capybara::Cuprite
     end
 
     def no_such_window_error
-      Ferrum::NoSuchWindowError
+      Ferrum::NoSuchPageError
     end
 
     def reset!

data/lib/capybara/cuprite/page.rb

@@ -1,13 +1,23 @@
 # frozen_string_literal: true
 
+require "forwardable"
+
 module Capybara::Cuprite
   module Page
     MODAL_WAIT = ENV.fetch("CUPRITE_MODAL_WAIT", 0.05).to_f
+    TRIGGER_CLICK_WAIT = ENV.fetch("CUPRITE_TRIGGER_CLICK_WAIT", 0.1).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)
@@ -21,7 +31,7 @@ module Capybara::Cuprite
 
     def trigger(node, event)
       options = {}
-      options.merge!(wait: Ferrum::Mouse::CLICK_WAIT) if event.to_s == "click"
+      options.merge!(wait: TRIGGER_CLICK_WAIT) if event.to_s == "click" && TRIGGER_CLICK_WAIT > 0
       evaluate_on(node: node, expression: %(_cuprite.trigger(this, "#{event}")), **options)
     end
 
@@ -59,7 +69,7 @@ module Capybara::Cuprite
 
     def find_modal(options)
       start = Ferrum.monotonic_time
-      timeout = options.fetch(:wait) { session_wait_time }
+      timeout = options.fetch(:wait, browser.timeout)
       expect_text = options[:text]
       expect_regexp = expect_text.is_a?(Regexp) ? expect_text : Regexp.escape(expect_text.to_s)
       not_found_msg = "Unable to find modal dialog"
@@ -104,6 +114,10 @@ module Capybara::Cuprite
       end
     end
 
+    def title
+      active_frame.current_title
+    end
+
     private
 
     def prepare_page
@@ -144,7 +158,11 @@ module Capybara::Cuprite
           options.merge!(promptText: response) if response
           command("Page.handleJavaScriptDialog", **options)
         else
-          warn "Modal window has been opened, but you didn't wrap your code into (`accept_prompt` | `dismiss_prompt` | `accept_confirm` | `dismiss_confirm` | `accept_alert`), accepting by default"
+          with_text = params["message"] ? "with text `#{params["message"]}` " : ""
+          warn "Modal window #{with_text}has been opened, but you didn't wrap "\
+               "your code into (`accept_prompt` | `dismiss_prompt` | "\
+               "`accept_confirm` | `dismiss_confirm` | `accept_alert`), "\
+               "accepting by default"
           options = { accept: true }
           response = params["defaultPrompt"]
           options.merge!(promptText: response) if response
@@ -162,5 +180,13 @@ module Capybara::Cuprite
         raise
       end
     end
+
+    def active_frame
+      if @frame_stack.empty?
+        main_frame
+      else
+        @frames[@frame_stack.last]
+      end
+    end
   end
 end

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.7.1"
+    VERSION = "0.8"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: '0.8'
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-20 00:00:00.000000000 Z
+date: 2019-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -34,16 +34,16 @@ dependencies:
   name: ferrum
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement