playwright-ruby-client 0.6.6 → 0.8.1

data/lib/playwright/channel_owners/cdp_session.rb

@@ -0,0 +1,19 @@
+module Playwright
+  define_channel_owner :CDPSession do
+    private def after_initialize
+      @channel.on('event', method(:on_event))
+    end
+
+    private def on_event(params)
+      emit(params['method'], params['params'])
+    end
+
+    def send_message(method, params: {})
+      @channel.send_message_to_server('send', method: method, params: params)
+    end
+
+    def detach
+      @channel.send_message_to_server('detach')
+    end
+  end
+end

data/lib/playwright/channel_owners/element_handle.rb

@@ -146,6 +146,7 @@ module Playwright
             index: nil,
             value: nil,
             label: nil,
+            force: nil,
             noWaitAfter: nil,
             timeout: nil)
         base_params = SelectOptionValues.new(
@@ -154,7 +155,7 @@ module Playwright
           value: value,
           label: label,
         ).as_params
-        params = base_params.merge({ noWaitAfter: noWaitAfter, timeout: timeout }.compact)
+        params = base_params.merge({ force: force, noWaitAfter: noWaitAfter, timeout: timeout }.compact)
         @channel.send_message_to_server('selectOption', params)
       end
 
@@ -179,9 +180,10 @@ module Playwright
         nil
       end
 
-      def fill(value, noWaitAfter: nil, timeout: nil)
+      def fill(value, force: nil, noWaitAfter: nil, timeout: nil)
         params = {
           value: value,
+          force: force,
           noWaitAfter: noWaitAfter,
           timeout: timeout,
         }.compact
@@ -190,13 +192,18 @@ module Playwright
         nil
       end
 
-      def select_text(timeout: nil)
-        params = { timeout: timeout }.compact
+      def select_text(force: nil, timeout: nil)
+        params = { force: force, timeout: timeout }.compact
         @channel.send_message_to_server('selectText', params)
 
         nil
       end
 
+      def input_value(timeout: nil)
+        params = { timeout: timeout }.compact
+        @channel.send_message_to_server('inputValue', params)
+      end
+
       def set_input_files(files, noWaitAfter: nil, timeout: nil)
         file_payloads = InputFiles.new(files).as_params
         params = { files: file_payloads, noWaitAfter: noWaitAfter, timeout: timeout }.compact

data/lib/playwright/channel_owners/frame.rb

@@ -71,7 +71,7 @@ module Playwright
 
       predicate =
         if url
-          matcher = UrlMatcher.new(url)
+          matcher = UrlMatcher.new(url, base_url: @page.context.send(:base_url))
           ->(event) { event['error'] || matcher.match?(event['url']) }
         else
           ->(_) { true }
@@ -99,7 +99,7 @@ module Playwright
     end
 
     def wait_for_url(url, timeout: nil, waitUntil: nil)
-      matcher = UrlMatcher.new(url)
+      matcher = UrlMatcher.new(url, base_url: @page.context.send(:base_url))
       if matcher.match?(@url)
         wait_for_load_state(state: waitUntil, timeout: timeout)
       else
@@ -293,6 +293,26 @@ module Playwright
       nil
     end
 
+    def drag_and_drop(
+          source,
+          target,
+          force: nil,
+          noWaitAfter: nil,
+          timeout: nil,
+          trial: nil)
+      params = {
+        source: source,
+        target: target,
+        force: force,
+        noWaitAfter: noWaitAfter,
+        timeout: timeout,
+        trial: trial,
+      }.compact
+      @channel.send_message_to_server('dragAndDrop', params)
+
+      nil
+    end
+
     def dblclick(
           selector,
           button: nil,
@@ -342,10 +362,16 @@ module Playwright
       nil
     end
 
-    def fill(selector, value, noWaitAfter: nil, timeout: nil)
+    def fill(
+          selector,
+          value,
+          force: nil,
+          noWaitAfter: nil,
+          timeout: nil)
       params = {
         selector: selector,
         value: value,
+        force: force,
         noWaitAfter: noWaitAfter,
         timeout: timeout,
       }.compact
@@ -410,6 +436,7 @@ module Playwright
           index: nil,
           value: nil,
           label: nil,
+          force: nil,
           noWaitAfter: nil,
           timeout: nil)
       base_params = SelectOptionValues.new(
@@ -418,10 +445,15 @@ module Playwright
         value: value,
         label: label,
       ).as_params
-      params = base_params.merge({ selector: selector, noWaitAfter: noWaitAfter, timeout: timeout }.compact)
+      params = base_params.merge({ selector: selector, force: force, noWaitAfter: noWaitAfter, timeout: timeout }.compact)
       @channel.send_message_to_server('selectOption', params)
     end
 
+    def input_value(selector, timeout: nil)
+      params = { selector: selector, timeout: timeout }.compact
+      @channel.send_message_to_server('inputValue', params)
+    end
+
     def set_input_files(selector, files, noWaitAfter: nil, timeout: nil)
       file_payloads = InputFiles.new(files).as_params
       params = { files: file_payloads, selector: selector, noWaitAfter: noWaitAfter, timeout: timeout }.compact

data/lib/playwright/channel_owners/page.rb

@@ -22,7 +22,7 @@ module Playwright
       end
       @closed = false
       @bindings = {}
-      @routes = Set.new
+      @routes = []
 
       @main_frame = ChannelOwners::Frame.from(@initializer['mainFrame'])
       @main_frame.send(:update_page_from_page, self)
@@ -184,15 +184,8 @@ module Playwright
       if name
         @frames.find { |f| f.name == name }
       elsif url
-        # ref: https://github.com/microsoft/playwright-python/blob/c4320c27cb080b385a5e45be46baa3cb7a9409ff/playwright/_impl/_helper.py#L104
-        case url
-        when String
-          @frames.find { |f| f.url == url }
-        when Regexp
-          @frames.find { |f| url.match?(f.url) }
-        else
-          raise NotImplementedError.new('Page#frame with url is not completely implemented yet')
-        end
+        matcher = UrlMatcher.new(url, base_url: @browser_context.send(:base_url))
+        @frames.find { |f| matcher.match?(f.url) }
       else
         raise ArgumentError.new('Either name or url matcher should be specified')
       end
@@ -377,8 +370,8 @@ module Playwright
     end
 
     def route(url, handler)
-      entry = RouteHandlerEntry.new(url, handler)
-      @routes << entry
+      entry = RouteHandlerEntry.new(url, @browser_context.send(:base_url), handler)
+      @routes.unshift(entry)
       if @routes.count >= 1
         @channel.send_message_to_server('setNetworkInterceptionEnabled', enabled: true)
       end
@@ -463,6 +456,23 @@ module Playwright
       )
     end
 
+    def drag_and_drop(
+          source,
+          target,
+          force: nil,
+          noWaitAfter: nil,
+          timeout: nil,
+          trial: nil)
+
+      @main_frame.drag_and_drop(
+        source,
+        target,
+        force: force,
+        noWaitAfter: noWaitAfter,
+        timeout: timeout,
+        trial: trial)
+    end
+
     def dblclick(
           selector,
           button: nil,
@@ -505,8 +515,13 @@ module Playwright
       )
     end
 
-    def fill(selector, value, noWaitAfter: nil, timeout: nil)
-      @main_frame.fill(selector, value, noWaitAfter: noWaitAfter, timeout: timeout)
+    def fill(
+      selector,
+      value,
+      force: nil,
+      noWaitAfter: nil,
+      timeout: nil)
+      @main_frame.fill(selector, value, force: force, noWaitAfter: noWaitAfter, timeout: timeout)
     end
 
     def focus(selector, timeout: nil)
@@ -552,6 +567,7 @@ module Playwright
           index: nil,
           value: nil,
           label: nil,
+          force: nil,
           noWaitAfter: nil,
           timeout: nil)
       @main_frame.select_option(
@@ -560,11 +576,16 @@ module Playwright
         index: index,
         value: value,
         label: label,
+        force: force,
         noWaitAfter: noWaitAfter,
         timeout: timeout,
       )
     end
 
+    def input_value(selector, timeout: nil)
+      @main_frame.input_value(selector, timeout: timeout)
+    end
+
     def set_input_files(selector, files, noWaitAfter: nil, timeout: nil)
       @main_frame.set_input_files(selector, files, noWaitAfter: noWaitAfter, timeout: timeout)
     end
@@ -748,7 +769,7 @@ module Playwright
       predicate =
         case urlOrPredicate
         when String, Regexp
-          url_matcher = UrlMatcher.new(urlOrPredicate)
+          url_matcher = UrlMatcher.new(urlOrPredicate, base_url: @browser_context.send(:base_url))
           -> (req){ url_matcher.match?(req.url) }
         when Proc
           urlOrPredicate
@@ -759,11 +780,15 @@ module Playwright
       expect_event(Events::Page::Request, predicate: predicate, timeout: timeout, &block)
     end
 
+    def expect_request_finished(predicate: nil, timeout: nil, &block)
+      expect_event(Events::Page::RequestFinished, predicate: predicate, timeout: timeout, &block)
+    end
+
     def expect_response(urlOrPredicate, timeout: nil, &block)
       predicate =
         case urlOrPredicate
         when String, Regexp
-          url_matcher = UrlMatcher.new(urlOrPredicate)
+          url_matcher = UrlMatcher.new(urlOrPredicate, base_url: @browser_context.send(:base_url))
           -> (req){ url_matcher.match?(req.url) }
         when Proc
           urlOrPredicate
@@ -774,6 +799,10 @@ module Playwright
       expect_event(Events::Page::Response, predicate: predicate, timeout: timeout, &block)
     end
 
+    def expect_websocket(predicate: nil, timeout: nil, &block)
+      expect_event(Events::Page::WebSocket, predicate: predicate, timeout: timeout, &block)
+    end
+
     # called from Frame with send(:timeout_settings)
     private def timeout_settings
       @timeout_settings

data/lib/playwright/channel_owners/response.rb

@@ -4,7 +4,7 @@ require 'json'
 module Playwright
   # @ref https://github.com/microsoft/playwright-python/blob/master/playwright/_impl/_network.py
   define_channel_owner :Response do
-    def after_initialize
+    private def after_initialize
       @request = ChannelOwners::Request.from(@initializer['request'])
       timing = @initializer['timing']
       @request.send(:update_timings,
@@ -44,6 +44,14 @@ module Playwright
       end.to_h
     end
 
+    def server_addr
+      @channel.send_message_to_server('serverAddr')
+    end
+
+    def security_details
+      @channel.send_message_to_server('securityDetails')
+    end
+
     def finished
       @channel.send_message_to_server('finished')
     end

data/lib/playwright/channel_owners/web_socket.rb

@@ -1,4 +1,87 @@
+require 'base64'
+
 module Playwright
   define_channel_owner :WebSocket do
+    private def after_initialize
+      @closed = false
+
+      @channel.on('frameSent', -> (params) {
+        on_frame_sent(params['opcode'], params['data'])
+      })
+      @channel.on('frameReceived', -> (params) {
+        on_frame_received(params['opcode'], params['data'])
+      })
+      @channel.on('socketError', -> (params) {
+        emit(Events::WebSocket::Error, params['error'])
+      })
+      @channel.on('close', -> (_) { on_close })
+    end
+
+    def url
+      @initializer['url']
+    end
+
+    class SocketClosedError < StandardError
+      def initialize
+        super('Socket closed')
+      end
+    end
+
+    class SocketError < StandardError
+      def initialize
+        super('Socket error')
+      end
+    end
+
+    class PageClosedError < StandardError
+      def initialize
+        super('Page closed')
+      end
+    end
+
+    def expect_event(event, predicate: nil, timeout: nil, &block)
+      wait_helper = WaitHelper.new
+      wait_helper.reject_on_timeout(timeout || @parent.send(:timeout_settings).timeout, "Timeout while waiting for event \"#{event}\"")
+
+      unless event == Events::WebSocket::Close
+        wait_helper.reject_on_event(self, Events::WebSocket::Close, SocketClosedError.new)
+      end
+
+      unless event == Events::WebSocket::Error
+        wait_helper.reject_on_event(self, Events::WebSocket::Error, SocketError.new)
+      end
+
+      wait_helper.reject_on_event(@parent, 'close', PageClosedError.new)
+      wait_helper.wait_for_event(self, event, predicate: predicate)
+      block&.call
+
+      wait_helper.promise.value!
+    end
+    alias_method :wait_for_event, :expect_event
+
+    private def on_frame_sent(opcode, data)
+      if opcode == 2
+        emit(Events::WebSocket::FrameSent, Base64.strict_decode64(data))
+      else
+        emit(Events::WebSocket::FrameSent, data)
+      end
+    end
+
+    private def on_frame_received(opcode, data)
+      if opcode == 2
+        emit(Events::WebSocket::FrameReceived, Base64.strict_decode64(data))
+      else
+        emit(Events::WebSocket::FrameReceived, data)
+      end
+    end
+
+    def closed?
+      @closed
+    end
+
+    private def on_close
+      @closed = true
+      emit(Events::WebSocket::Close)
+    end
   end
 end

data/lib/playwright/connection.rb

@@ -5,10 +5,8 @@ module Playwright
   # https://github.com/microsoft/playwright-python/blob/master/playwright/_impl/_connection.py
   # https://github.com/microsoft/playwright-java/blob/master/playwright/src/main/java/com/microsoft/playwright/impl/Connection.java
   class Connection
-    def initialize(playwright_cli_executable_path:)
-      @transport = Transport.new(
-        playwright_cli_executable_path: playwright_cli_executable_path
-      )
+    def initialize(transport)
+      @transport = transport
       @transport.on_message_received do |message|
         dispatch(message)
       end

data/lib/playwright/download.rb

@@ -24,5 +24,9 @@ module Playwright
     def save_as(path)
       @artifact.save_as(path)
     end
+
+    def cancel
+      @artifact.cancel
+    end
   end
 end

data/lib/playwright/route_handler_entry.rb

@@ -1,10 +1,11 @@
 module Playwright
   class RouteHandlerEntry
     # @param url [String]
+    # @param base_url [String|nil]
     # @param handler [Proc]
-    def initialize(url, handler)
+    def initialize(url, base_url, handler)
       @url_value = url
-      @url_matcher = UrlMatcher.new(url)
+      @url_matcher = UrlMatcher.new(url, base_url: base_url)
       @handler = handler
     end
 

data/lib/playwright/transport.rb

@@ -8,7 +8,6 @@ module Playwright
   # ref: https://github.com/microsoft/playwright-python/blob/master/playwright/_impl/_transport.py
   class Transport
     # @param playwright_cli_executable_path [String] path to playwright-cli.
-    # @param debug [Boolean]
     def initialize(playwright_cli_executable_path:)
       @driver_executable_path = playwright_cli_executable_path
       @debug = ENV['DEBUG'].to_s == 'true' || ENV['DEBUG'].to_s == '1'