playwright-ruby-client 0.7.0 → 0.9.0

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)
@@ -124,7 +124,7 @@ module Playwright
     end
 
     private def on_download(params)
-      download = Download.new(
+      download = DownloadImpl.new(
         page: self,
         url: params['url'],
         suggested_filename: params['suggestedFilename'],
@@ -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
@@ -212,44 +205,48 @@ module Playwright
       @channel.send_message_to_server('setDefaultTimeoutNoReply', timeout: timeout)
     end
 
-    def query_selector(selector)
-      @main_frame.query_selector(selector)
+    def query_selector(selector, strict: nil)
+      @main_frame.query_selector(selector, strict: strict)
     end
 
     def query_selector_all(selector)
       @main_frame.query_selector_all(selector)
     end
 
-    def wait_for_selector(selector, state: nil, timeout: nil)
-      @main_frame.wait_for_selector(selector, state: state, timeout: timeout)
+    def wait_for_selector(selector, state: nil, strict: nil, timeout: nil)
+      @main_frame.wait_for_selector(selector, state: state, strict: strict, timeout: timeout)
+    end
+
+    def checked?(selector, strict: nil, timeout: nil)
+      @main_frame.checked?(selector, strict: strict, timeout: timeout)
     end
 
-    def checked?(selector, timeout: nil)
-      @main_frame.checked?(selector, timeout: timeout)
+    def disabled?(selector, strict: nil, timeout: nil)
+      @main_frame.disabled?(selector, strict: strict, timeout: timeout)
     end
 
-    def disabled?(selector, timeout: nil)
-      @main_frame.disabled?(selector, timeout: timeout)
+    def editable?(selector, strict: nil, timeout: nil)
+      @main_frame.editable?(selector, strict: strict, timeout: timeout)
     end
 
-    def editable?(selector, timeout: nil)
-      @main_frame.editable?(selector, timeout: timeout)
+    def enabled?(selector, strict: nil, timeout: nil)
+      @main_frame.enabled?(selector, strict: strict, timeout: timeout)
     end
 
-    def enabled?(selector, timeout: nil)
-      @main_frame.enabled?(selector, timeout: timeout)
+    def hidden?(selector, strict: nil, timeout: nil)
+      @main_frame.hidden?(selector, strict: strict, timeout: timeout)
     end
 
-    def hidden?(selector, timeout: nil)
-      @main_frame.hidden?(selector, timeout: timeout)
+    def visible?(selector, strict: nil, timeout: nil)
+      @main_frame.visible?(selector, strict: strict, timeout: timeout)
     end
 
-    def visible?(selector, timeout: nil)
-      @main_frame.visible?(selector, timeout: timeout)
+    def locator(selector)
+      @main_frame.locator(selector)
     end
 
-    def dispatch_event(selector, type, eventInit: nil, timeout: nil)
-      @main_frame.dispatch_event(selector, type, eventInit: eventInit, timeout: timeout)
+    def dispatch_event(selector, type, eventInit: nil, strict: nil, timeout: nil)
+      @main_frame.dispatch_event(selector, type, eventInit: eventInit, strict: strict, timeout: timeout)
     end
 
     def evaluate(pageFunction, arg: nil)
@@ -260,8 +257,8 @@ module Playwright
       @main_frame.evaluate_handle(pageFunction, arg: arg)
     end
 
-    def eval_on_selector(selector, pageFunction, arg: nil)
-      @main_frame.eval_on_selector(selector, pageFunction, arg: arg)
+    def eval_on_selector(selector, pageFunction, arg: nil, strict: nil)
+      @main_frame.eval_on_selector(selector, pageFunction, arg: arg, strict: strict)
     end
 
     def eval_on_selector_all(selector, pageFunction, arg: nil)
@@ -377,8 +374,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
@@ -446,6 +443,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          strict: nil,
           timeout: nil,
           trial: nil)
 
@@ -458,11 +456,31 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        strict: strict,
         timeout: timeout,
         trial: trial,
       )
     end
 
+    def drag_and_drop(
+          source,
+          target,
+          force: nil,
+          noWaitAfter: nil,
+          strict: nil,
+          timeout: nil,
+          trial: nil)
+
+      @main_frame.drag_and_drop(
+        source,
+        target,
+        force: force,
+        noWaitAfter: noWaitAfter,
+        strict: strict,
+        timeout: timeout,
+        trial: trial)
+    end
+
     def dblclick(
           selector,
           button: nil,
@@ -471,6 +489,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          strict: nil,
           timeout: nil,
           trial: nil)
       @main_frame.dblclick(
@@ -481,6 +500,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        strict: strict,
         timeout: timeout,
         trial: trial,
       )
@@ -492,6 +512,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          strict: nil,
           timeout: nil,
           trial: nil)
       @main_frame.tap_point(
@@ -500,33 +521,46 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        strict: strict,
         timeout: timeout,
         trial: trial,
       )
     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,
+      strict: nil,
+      timeout: nil)
+      @main_frame.fill(
+        selector,
+        value,
+        force: force,
+        noWaitAfter: noWaitAfter,
+        strict: strict,
+        timeout: timeout)
     end
 
-    def focus(selector, timeout: nil)
-      @main_frame.focus(selector, timeout: timeout)
+    def focus(selector, strict: nil, timeout: nil)
+      @main_frame.focus(selector, strict: strict, timeout: timeout)
     end
 
-    def text_content(selector, timeout: nil)
-      @main_frame.text_content(selector, timeout: timeout)
+    def text_content(selector, strict: nil, timeout: nil)
+      @main_frame.text_content(selector, strict: strict, timeout: timeout)
     end
 
-    def inner_text(selector, timeout: nil)
-      @main_frame.inner_text(selector, timeout: timeout)
+    def inner_text(selector, strict: nil, timeout: nil)
+      @main_frame.inner_text(selector, strict: strict, timeout: timeout)
     end
 
-    def inner_html(selector, timeout: nil)
-      @main_frame.inner_html(selector, timeout: timeout)
+    def inner_html(selector, strict: nil, timeout: nil)
+      @main_frame.inner_html(selector, strict: strict, timeout: timeout)
     end
 
-    def get_attribute(selector, name, timeout: nil)
-      @main_frame.get_attribute(selector, name, timeout: timeout)
+    def get_attribute(selector, name, strict: nil, timeout: nil)
+      @main_frame.get_attribute(selector, name, strict: strict, timeout: timeout)
     end
 
     def hover(
@@ -534,6 +568,7 @@ module Playwright
           force: nil,
           modifiers: nil,
           position: nil,
+          strict: nil,
           timeout: nil,
           trial: nil)
       @main_frame.hover(
@@ -541,6 +576,7 @@ module Playwright
         force: force,
         modifiers: modifiers,
         position: position,
+        strict: strict,
         timeout: timeout,
         trial: trial,
       )
@@ -552,7 +588,9 @@ module Playwright
           index: nil,
           value: nil,
           label: nil,
+          force: nil,
           noWaitAfter: nil,
+          strict: nil,
           timeout: nil)
       @main_frame.select_option(
         selector,
@@ -560,13 +598,24 @@ module Playwright
         index: index,
         value: value,
         label: label,
+        force: force,
         noWaitAfter: noWaitAfter,
+        strict: strict,
         timeout: timeout,
       )
     end
 
-    def set_input_files(selector, files, noWaitAfter: nil, timeout: nil)
-      @main_frame.set_input_files(selector, files, noWaitAfter: noWaitAfter, timeout: timeout)
+    def input_value(selector, strict: nil, timeout: nil)
+      @main_frame.input_value(selector, strict: strict, timeout: timeout)
+    end
+
+    def set_input_files(selector, files, noWaitAfter: nil, strict: nil,timeout: nil)
+      @main_frame.set_input_files(
+        selector,
+        files,
+        noWaitAfter: noWaitAfter,
+        strict: strict,
+        timeout: timeout)
     end
 
     def type(
@@ -574,9 +623,16 @@ module Playwright
       text,
       delay: nil,
       noWaitAfter: nil,
+      strict: nil,
       timeout: nil)
 
-      @main_frame.type(selector, text, delay: delay, noWaitAfter: noWaitAfter, timeout: timeout)
+      @main_frame.type(
+        selector,
+        text,
+        delay: delay,
+        noWaitAfter: noWaitAfter,
+        strict: strict,
+        timeout: timeout)
     end
 
     def press(
@@ -584,9 +640,16 @@ module Playwright
       key,
       delay: nil,
       noWaitAfter: nil,
+      strict: nil,
       timeout: nil)
 
-      @main_frame.press(selector, key, delay: delay, noWaitAfter: noWaitAfter, timeout: timeout)
+      @main_frame.press(
+        selector,
+        key,
+        delay: delay,
+        noWaitAfter: noWaitAfter,
+        strict: strict,
+        timeout: timeout)
     end
 
     def check(
@@ -594,10 +657,18 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
+      strict: nil,
       timeout: nil,
       trial: nil)
 
-      @main_frame.check(selector, force: force, noWaitAfter: noWaitAfter, position: position, timeout: timeout, trial: trial)
+      @main_frame.check(
+        selector,
+        force: force,
+        noWaitAfter: noWaitAfter,
+        position: position,
+        strict: strict,
+        timeout: timeout,
+        trial: trial)
     end
 
     def uncheck(
@@ -605,16 +676,28 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
+      strict: nil,
       timeout: nil,
       trial: nil)
 
-      @main_frame.uncheck(selector, force: force, noWaitAfter: noWaitAfter, position: position, timeout: timeout, trial: trial)
+      @main_frame.uncheck(
+        selector,
+        force: force,
+        noWaitAfter: noWaitAfter,
+        position: position,
+        strict: strict,
+        timeout: timeout,
+        trial: trial)
     end
 
     def wait_for_function(pageFunction, arg: nil, polling: nil, timeout: nil)
       @main_frame.wait_for_function(pageFunction, arg: arg, polling: polling, timeout: timeout)
     end
 
+    def pause
+      @browser_context.send(:pause)
+    end
+
     def pdf(
           displayHeaderFooter: nil,
           footerTemplate: nil,
@@ -748,7 +831,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 +842,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

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/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 → download_impl.rb}

@@ -1,5 +1,5 @@
 module Playwright
-  class Download
+  define_api_implementation :DownloadImpl do
     def initialize(page:, url:, suggested_filename:, artifact:)
       @page = page
       @url = url
@@ -24,5 +24,9 @@ module Playwright
     def save_as(path)
       @artifact.save_as(path)
     end
+
+    def cancel
+      @artifact.cancel
+    end
   end
 end