playwright-ruby-client 1.61.0 → 1.62.0

data/lib/playwright/api_response_impl.rb

@@ -47,6 +47,22 @@ module Playwright
       @initializer['serverAddr']
     end
 
+    def timing
+      response_end = @initializer['responseEndTiming']
+      {
+        'startTime' => -1,
+        'domainLookupStart' => -1,
+        'domainLookupEnd' => -1,
+        'connectStart' => -1,
+        'secureConnectionStart' => -1,
+        'connectEnd' => -1,
+        'requestStart' => -1,
+        'responseStart' => -1,
+      }.merge(@initializer['timing'] || {}).merge(
+        'responseEnd' => response_end.nil? ? -1 : response_end,
+      )
+    end
+
     class AlreadyDisposedError < StandardError
       def initialize
         super('Response has been disposed')

data/lib/playwright/channel_owners/browser_context.rb

@@ -462,8 +462,12 @@ module Playwright
       @channel.send_message_to_server('pause')
     end
 
-    def storage_state(path: nil, indexedDB: nil)
-      @channel.send_message_to_server_result('storageState', { indexedDB: indexedDB }.compact).tap do |result|
+    def storage_state(path: nil, indexedDB: nil, credentials: nil)
+      params = {
+        indexedDB: indexedDB,
+        credentials: credentials,
+      }.compact
+      @channel.send_message_to_server_result('storageState', params).tap do |result|
         if path
           File.open(path, 'w') do |f|
             f.write(JSON.dump(result))

data/lib/playwright/channel_owners/element_handle.rb

@@ -1,4 +1,5 @@
 require_relative './js_handle'
+require_relative '../screenshot_utils'
 
 module Playwright
   module ChannelOwners
@@ -86,6 +87,7 @@ module Playwright
             modifiers: nil,
             noWaitAfter: nil,
             position: nil,
+            scroll: nil,
             timeout: nil,
             trial: nil)
         params = {
@@ -93,6 +95,7 @@ module Playwright
           modifiers: modifiers,
           noWaitAfter: noWaitAfter,
           position: position,
+          scroll: scroll,
           timeout: _timeout(timeout),
           trial: trial,
         }.compact
@@ -109,6 +112,7 @@ module Playwright
             modifiers: nil,
             noWaitAfter: nil,
             position: nil,
+            scroll: nil,
             timeout: nil,
             trial: nil,
             steps: nil)
@@ -121,6 +125,7 @@ module Playwright
           modifiers: modifiers,
           noWaitAfter: noWaitAfter,
           position: position,
+          scroll: scroll,
           timeout: _timeout(timeout),
           trial: trial,
           steps: steps,
@@ -137,6 +142,7 @@ module Playwright
             modifiers: nil,
             noWaitAfter: nil,
             position: nil,
+            scroll: nil,
             timeout: nil,
             trial: nil,
             steps: nil)
@@ -148,6 +154,7 @@ module Playwright
           modifiers: modifiers,
           noWaitAfter: noWaitAfter,
           position: position,
+          scroll: scroll,
           timeout: _timeout(timeout),
           trial: trial,
           steps: steps,
@@ -180,6 +187,7 @@ module Playwright
             modifiers: nil,
             noWaitAfter: nil,
             position: nil,
+            scroll: nil,
             timeout: nil,
             trial: nil)
 
@@ -188,6 +196,7 @@ module Playwright
           modifiers: modifiers,
           noWaitAfter: noWaitAfter,
           position: position,
+          scroll: scroll,
           timeout: _timeout(timeout),
           trial: trial,
         }.compact
@@ -263,11 +272,12 @@ module Playwright
         nil
       end
 
-      def check(force: nil, noWaitAfter: nil, position: nil, timeout: nil, trial: nil)
+      def check(force: nil, noWaitAfter: nil, position: nil, scroll: nil, timeout: nil, trial: nil)
         params = {
           force: force,
           noWaitAfter:  noWaitAfter,
           position: position,
+          scroll: scroll,
           timeout: _timeout(timeout),
           trial: trial,
         }.compact
@@ -276,11 +286,12 @@ module Playwright
         nil
       end
 
-      def uncheck(force: nil, noWaitAfter: nil, position: nil, timeout: nil, trial: nil)
+      def uncheck(force: nil, noWaitAfter: nil, position: nil, scroll: nil, timeout: nil, trial: nil)
         params = {
           force: force,
           noWaitAfter:  noWaitAfter,
           position: position,
+          scroll: scroll,
           timeout: _timeout(timeout),
           trial: trial,
         }.compact
@@ -319,12 +330,11 @@ module Playwright
           caret: caret,
           maskColor: maskColor,
           omitBackground: omitBackground,
-          path: path,
           quality: quality,
           scale: scale,
           style: style,
           timeout: _timeout(timeout),
-          type: type,
+          type: ScreenshotUtils.determine_type(path: path, type: type),
         }.compact
         if mask.is_a?(Enumerable)
           params[:mask] = mask.map do |locator|

data/lib/playwright/channel_owners/frame.rb

@@ -338,6 +338,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil,
@@ -352,6 +353,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: _timeout(timeout),
         trial: trial,
@@ -367,6 +369,7 @@ module Playwright
           target,
           force: nil,
           noWaitAfter: nil,
+          scroll: nil,
           sourcePosition: nil,
           strict: nil,
           targetPosition: nil,
@@ -379,6 +382,7 @@ module Playwright
         target: target,
         force: force,
         noWaitAfter: noWaitAfter,
+        scroll: scroll,
         sourcePosition: sourcePosition,
         strict: strict,
         targetPosition: targetPosition,
@@ -416,6 +420,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil,
@@ -429,6 +434,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: _timeout(timeout),
         trial: trial,
@@ -445,6 +451,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil)
@@ -454,6 +461,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: _timeout(timeout),
         trial: trial,
@@ -539,6 +547,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil)
@@ -548,6 +557,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: _timeout(timeout),
         trial: trial,
@@ -642,6 +652,7 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
+      scroll: nil,
       strict: nil,
       timeout: nil,
       trial: nil)
@@ -651,6 +662,7 @@ module Playwright
         force: force,
         noWaitAfter:  noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: _timeout(timeout),
         trial: trial,
@@ -665,6 +677,7 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
+      scroll: nil,
       strict: nil,
       timeout: nil,
       trial: nil)
@@ -674,6 +687,7 @@ module Playwright
         force: force,
         noWaitAfter:  noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: _timeout(timeout),
         trial: trial,

data/lib/playwright/channel_owners/page.rb

@@ -1,5 +1,6 @@
 require 'base64'
 require_relative '../locator_utils'
+require_relative '../screenshot_utils'
 
 module Playwright
   # @ref https://github.com/microsoft/playwright-python/blob/master/playwright/_impl/_page.py
@@ -483,7 +484,7 @@ module Playwright
       type: nil)
 
       params = {
-        type: type,
+        type: ScreenshotUtils.determine_type(path: path, type: type),
         quality: quality,
         fullPage: fullPage,
         clip: clip,
@@ -545,6 +546,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil,
@@ -559,6 +561,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: timeout,
         trial: trial,
@@ -571,6 +574,7 @@ module Playwright
           target,
           force: nil,
           noWaitAfter: nil,
+          scroll: nil,
           sourcePosition: nil,
           strict: nil,
           targetPosition: nil,
@@ -583,6 +587,7 @@ module Playwright
         target,
         force: force,
         noWaitAfter: noWaitAfter,
+        scroll: scroll,
         sourcePosition: sourcePosition,
         strict: strict,
         targetPosition: targetPosition,
@@ -600,6 +605,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil,
@@ -612,6 +618,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: timeout,
         trial: trial,
@@ -625,6 +632,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil)
@@ -634,6 +642,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: timeout,
         trial: trial,
@@ -690,16 +699,12 @@ module Playwright
       @channel.send_message_to_server('hideHighlight')
     end
 
-    def aria_snapshot(boxes: nil, depth: nil, mode: nil, timeout: nil, _track: nil)
+    def aria_snapshot(boxes: nil, depth: nil, mode: nil, timeout: nil)
       params = { selector: 'body' }
       params[:timeout] = @timeout_settings.timeout(timeout)
       params[:boxes] = boxes unless boxes.nil?
       params[:depth] = depth if depth
       params[:mode] = mode if mode
-      if _track
-        params.delete(:selector)
-        params[:track] = _track
-      end
       result = @main_frame.channel.send_message_to_server_result('ariaSnapshot', params)
       result['snapshot']
     end
@@ -748,6 +753,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           strict: nil,
           timeout: nil,
           trial: nil)
@@ -757,6 +763,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: timeout,
         trial: trial,
@@ -838,6 +845,7 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
+      scroll: nil,
       strict: nil,
       timeout: nil,
       trial: nil)
@@ -847,6 +855,7 @@ module Playwright
         force: force,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: timeout,
         trial: trial)
@@ -857,6 +866,7 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
+      scroll: nil,
       strict: nil,
       timeout: nil,
       trial: nil)
@@ -866,6 +876,7 @@ module Playwright
         force: force,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         strict: strict,
         timeout: timeout,
         trial: trial)
@@ -962,8 +973,8 @@ module Playwright
       @main_frame.locator(result['selector'])
     end
 
-    def snapshot_for_ai(timeout: nil, depth: nil, boxes: nil, _track: nil)
-      aria_snapshot(mode: 'ai', timeout: timeout, depth: depth, boxes: boxes, _track: _track)
+    def snapshot_for_ai(timeout: nil, depth: nil, boxes: nil)
+      aria_snapshot(mode: 'ai', timeout: timeout, depth: depth, boxes: boxes)
     end
 
     def _assertions(timeout, is_not, message)

data/lib/playwright/connection.rb

@@ -87,6 +87,13 @@ module Playwright
         # @see https://github.com/YusukeIwaki/puppeteer-ruby/pull/34
         @callbacks_mutex.synchronize { @callbacks[id] = callback } unless fire_and_forget
 
+        wire_params = params.dup
+        timeout = if wire_params.key?(:timeout)
+                    wire_params.delete(:timeout)
+                  elsif wire_params.key?('timeout')
+                    wire_params.delete('timeout')
+                  end
+
         _metadata = {}
         frames = []
         if metadata
@@ -99,13 +106,14 @@ module Playwright
             _metadata[:title] = metadata[:title]
           end
         end
+        _metadata[:timeout] = timeout unless timeout.nil?
         _metadata.compact!
 
         message = {
           id: id,
           guid: guid,
           method: method,
-          params: replace_channels_with_guids(params),
+          params: replace_channels_with_guids(wire_params),
           metadata: _metadata,
         }
 

data/lib/playwright/locator_assertions_impl.rb

@@ -214,7 +214,20 @@ module Playwright
     end
     _define_negation :to_have_accessible_error_message
 
-    def to_have_attribute(name, value, ignoreCase: nil, timeout: nil)
+    def to_have_attribute(name, value: nil, ignoreCase: nil, timeout: nil)
+      if value.nil?
+        return expect_impl(
+          'to.have.attribute',
+          {
+            expressionArg: name,
+            timeout: timeout,
+          },
+          nil,
+          'Locator expected to have attribute',
+          'Expect "to_have_attribute"',
+        )
+      end
+
       expected_text = to_expected_text_values([value], ignore_case: ignoreCase)
       expect_impl(
         "to.have.attribute.value",

data/lib/playwright/locator_impl.rb

@@ -105,6 +105,7 @@ module Playwright
           force: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           timeout: nil,
           trial: nil)
 
@@ -113,6 +114,7 @@ module Playwright
         force: force,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         timeout: timeout,
         trial: trial)
     end
@@ -125,6 +127,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           timeout: nil,
           trial: nil,
           steps: nil)
@@ -138,6 +141,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         timeout: timeout,
         trial: trial,
         steps: steps)
@@ -150,6 +154,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           timeout: nil,
           trial: nil,
           steps: nil)
@@ -162,6 +167,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         timeout: timeout,
         trial: trial,
         steps: steps)
@@ -174,6 +180,7 @@ module Playwright
     def drag_to(target,
           force: nil,
           noWaitAfter: nil,
+          scroll: nil,
           sourcePosition: nil,
           targetPosition: nil,
           timeout: nil,
@@ -185,6 +192,7 @@ module Playwright
         target.instance_variable_get(:@selector),
         force: force,
         noWaitAfter: noWaitAfter,
+        scroll: scroll,
         sourcePosition: sourcePosition,
         targetPosition: targetPosition,
         timeout: timeout,
@@ -363,6 +371,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           timeout: nil,
           trial: nil)
       @frame.hover(@selector,
@@ -371,6 +380,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         timeout: timeout,
         trial: trial)
     end
@@ -426,7 +436,7 @@ module Playwright
       end
     end
 
-    def aria_snapshot(boxes: nil, depth: nil, mode: nil, timeout: nil, _track: nil)
+    def aria_snapshot(boxes: nil, depth: nil, mode: nil, timeout: nil)
       params = {
         selector: @selector,
         timeout: _timeout(timeout),
@@ -434,10 +444,6 @@ module Playwright
       params[:boxes] = boxes unless boxes.nil?
       params[:depth] = depth if depth
       params[:mode] = mode if mode
-      if _track
-        params.delete(:selector)
-        params[:track] = _track
-      end
       result = @frame.channel.send_message_to_server_result('ariaSnapshot', params.compact)
       result['snapshot']
     end
@@ -499,6 +505,7 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           timeout: nil,
           trial: nil)
       @frame.tap_point(@selector,
@@ -507,6 +514,7 @@ module Playwright
         modifiers: modifiers,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         timeout: timeout,
         trial: trial)
     end
@@ -527,6 +535,7 @@ module Playwright
           force: nil,
           noWaitAfter: nil,
           position: nil,
+          scroll: nil,
           timeout: nil,
           trial: nil)
       @frame.uncheck(@selector,
@@ -534,10 +543,24 @@ module Playwright
         force: force,
         noWaitAfter: noWaitAfter,
         position: position,
+        scroll: scroll,
         timeout: timeout,
         trial: trial)
     end
 
+    def wait_for_function(expression, arg: nil, timeout: nil)
+      @frame.channel.send_message_to_server(
+        'waitForFunction',
+        selector: @selector,
+        strict: true,
+        expression: expression,
+        isFunction: true,
+        arg: JavaScript::ValueSerializer.new(arg).serialize,
+        timeout: _timeout(timeout),
+      )
+      nil
+    end
+
     def wait_for(state: nil, timeout: nil)
       @frame.wait_for_selector(@selector, strict: true, state: state, timeout: timeout)
     end

data/lib/playwright/screencast.rb

@@ -86,12 +86,26 @@ module Playwright
     end
 
     private def handle_screencast_frame(event)
-      @on_frame&.call({
-        data: Base64.strict_decode64(event['data']),
-        timestamp: event['timestamp'],
-        viewportWidth: event['viewportWidth'],
-        viewportHeight: event['viewportHeight'],
-      })
+      on_frame = @on_frame
+      Thread.new do
+        begin
+          on_frame&.call({
+            data: Base64.strict_decode64(event['data']),
+            timestamp: event['timestamp'],
+            viewportWidth: event['viewportWidth'],
+            viewportHeight: event['viewportHeight'],
+          })
+        ensure
+          begin
+            @page.send(:channel).async_send_message_to_server(
+              'screencastFrameAck',
+              frameId: event['frameId'],
+            )
+          rescue Transport::AlreadyDisconnectedError
+            # The page or driver may close while a callback is running.
+          end
+        end
+      end
     end
   end
 end

data/lib/playwright/screenshot_utils.rb

@@ -0,0 +1,24 @@
+require 'mime/types'
+
+module Playwright
+  module ScreenshotUtils
+    module_function
+
+    def determine_type(path:, type:)
+      return type if type
+      return nil unless path
+
+      mime_type = MIME::Types.type_for(path).first
+      case mime_type&.content_type
+      when 'image/png'
+        'png'
+      when 'image/jpeg'
+        'jpeg'
+      when 'image/webp'
+        'webp'
+      else
+        raise ArgumentError.new("path: unsupported mime type \"#{mime_type}\"")
+      end
+    end
+  end
+end

data/lib/playwright/test.rb

@@ -30,7 +30,7 @@ module Playwright
         end
 
         def matches?(actual)
-          assertions_for(actual, false).send(@method, *@args, **@kwargs)
+          call_assertion(actual, false)
           true
         rescue AssertionError => e
           @failure_message = e.full_message
@@ -38,7 +38,7 @@ module Playwright
         end
 
         def does_not_match?(actual)
-          assertions_for(actual, true).send(@method, *@args, **@kwargs)
+          call_assertion(actual, true)
           true
         rescue AssertionError => e
           @failure_message = e.full_message
@@ -55,6 +55,16 @@ module Playwright
 
         private
 
+        def call_assertion(actual, is_not)
+          args = @args
+          kwargs = @kwargs
+          if ['to_have_attribute', 'not_to_have_attribute'].include?(@method) && args.length == 2 && !kwargs.key?(:value)
+            args = [args.first]
+            kwargs = kwargs.merge(value: @args.last)
+          end
+          assertions_for(actual, is_not).send(@method, *args, **kwargs)
+        end
+
         def assertions_for(actual, is_not)
           if actual.respond_to?(:_assertions)
             actual._assertions(::Playwright::Test.expect_timeout, is_not, nil)