cuprite 0.2.1 → 0.3.0

data/lib/capybara/cuprite/browser/targets.rb

@@ -40,10 +40,7 @@ module Capybara::Cuprite
       end
 
       def switch_to_window(target_id)
-        page = @targets[target_id]
-        page ||= Page.new(target_id, @browser)
-        @targets[target_id] ||= page
-        @page = page
+        @page = find_or_create_page(target_id)
       end
 
       def open_new_window
@@ -59,6 +56,15 @@ module Capybara::Cuprite
 
       def within_window(locator)
         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)
+            locator == page.frame_name
+          end
+          locator = target_id if target_id
+        end
+
         if window_handles.include?(locator)
           switch_to_window(locator)
           yield
@@ -87,6 +93,13 @@ module Capybara::Cuprite
 
       private
 
+      def find_or_create_page(target_id)
+        page = @targets[target_id]
+        page ||= Page.new(target_id, @browser)
+        @targets[target_id] ||= page
+        page
+      end
+
       def remove_page(target_id)
         page = @targets.delete(target_id)
         @page = nil if page && @page == page

data/lib/capybara/cuprite/browser/web_socket.rb

@@ -2,16 +2,11 @@
 
 require "json"
 require "socket"
-require "forwardable"
 require "websocket/driver"
 
 module Capybara::Cuprite
   class Browser
     class WebSocket
-      extend Forwardable
-
-      delegate close: :@driver
-
       attr_reader :url, :messages
 
       def initialize(url, logger)
@@ -22,7 +17,9 @@ module Capybara::Cuprite
         @driver   = ::WebSocket::Driver.client(self)
         @messages = Queue.new
 
+        @driver.on(:open,    &method(:on_open))
         @driver.on(:message, &method(:on_message))
+        @driver.on(:close,   &method(:on_close))
 
         @thread = Thread.new do
           begin
@@ -39,22 +36,34 @@ module Capybara::Cuprite
         @driver.start
       end
 
-      def send_message(data)
-        @started_at ||= Time.now.to_f
-        json = data.to_json
-        @driver.text(json)
-        @logger&.puts("\n\n[#{Time.now.to_f - @started_at}] >>> #{json}")
+      def on_open(_event)
+        sleep 0.01 # https://github.com/faye/websocket-driver-ruby/issues/46
       end
 
       def on_message(event)
         data = JSON.parse(event.data)
         @messages.push(data)
-        @logger&.puts("[#{Time.now.to_f - @started_at}] <<< #{event.data}\n")
+        @logger&.puts("    <<< #{event.data}\n")
+      end
+
+      def on_close(_event)
+        @messages.close
+        @thread.kill
+      end
+
+      def send_message(data)
+        json = data.to_json
+        @driver.text(json)
+        @logger&.puts("\n\n>>> #{json}")
       end
 
       def write(data)
         @sock.write(data)
       end
+
+      def close
+        @driver.close
+      end
     end
   end
 end

data/lib/capybara/cuprite/driver.rb

@@ -95,10 +95,6 @@ module Capybara::Cuprite
       nil
     end
 
-    def within_frame(name, &block)
-      browser.within_frame(name, &block)
-    end
-
     def switch_to_frame(locator)
       browser.switch_to_frame(locator)
     end
@@ -301,15 +297,15 @@ module Capybara::Cuprite
 
     def accept_modal(type, options = {})
       case type
-      when :confirm
+      when :alert, :confirm
         browser.accept_confirm
       when :prompt
-        browser.accept_prompt options[:with]
+        browser.accept_prompt(options[:with])
       end
 
       yield if block_given?
 
-      find_modal(options)
+      browser.find_modal(options)
     end
 
     def dismiss_modal(type, options = {})
@@ -321,7 +317,8 @@ module Capybara::Cuprite
       end
 
       yield if block_given?
-      find_modal(options)
+
+      browser.find_modal(options)
     end
 
     private
@@ -342,25 +339,6 @@ module Capybara::Cuprite
       @options[:screen_size] || [1366, 768]
     end
 
-    def find_modal(options)
-      start_time    = Time.now
-      timeout_sec   = options.fetch(:wait) { session_wait_time }
-      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"
-      not_found_msg += " with #{expect_text}" if expect_text
-
-      begin
-        modal_text = browser.modal_message
-        raise Capybara::ModalNotFound if modal_text.nil? || (expect_text && !modal_text.match(expect_regexp))
-      rescue Capybara::ModalNotFound => e
-        raise e, not_found_msg if (Time.now - start_time) >= timeout_sec
-        sleep(0.05)
-        retry
-      end
-      modal_text
-    end
-
     def session_wait_time
       if respond_to?(:session_options)
         session_options.default_max_wait_time

data/lib/capybara/cuprite/errors.rb

@@ -101,12 +101,6 @@ module Capybara
       end
     end
 
-    class KeyError < ::ArgumentError
-      def initialize(response)
-        super(response["args"].first)
-      end
-    end
-
     class TimeoutError < Error
       def message
         "Timed out waiting for response. It's possible that this happened " \

data/lib/capybara/cuprite/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Cuprite
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cuprite
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Dmitry Vorotilin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -34,16 +34,22 @@ dependencies:
   name: websocket-driver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '0.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.6'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: cliver
   requirement: !ruby/object:Gem::Requirement
@@ -58,26 +64,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.0.6
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '3'
 - !ruby/object:Gem::Dependency
   name: image_size
   requirement: !ruby/object:Gem::Requirement
@@ -176,7 +162,21 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Cuprite is a driver for Capybara that allows you torun your tests on
+- !ruby/object:Gem::Dependency
+  name: puma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: Cuprite is a driver for Capybara that allows you to run your tests on
   a headless Chrome browser
 email:
 - d.vorotilin@gmail.com
@@ -191,6 +191,7 @@ files:
 - lib/capybara/cuprite/browser/client.rb
 - lib/capybara/cuprite/browser/dom.rb
 - lib/capybara/cuprite/browser/frame.rb
+- lib/capybara/cuprite/browser/input.json
 - lib/capybara/cuprite/browser/input.rb
 - lib/capybara/cuprite/browser/javascripts/index.js
 - lib/capybara/cuprite/browser/page.rb