playwright-ruby-client 0.5.10 → 0.6.4

data/lib/playwright/channel_owners/js_handle.rb

@@ -14,19 +14,11 @@ module Playwright
     end
 
     def evaluate(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate(@channel)
     end
 
     def evaluate_handle(pageFunction, arg: nil)
-      if JavaScript.function?(pageFunction)
-        JavaScript::Function.new(pageFunction, arg).evaluate_handle(@channel)
-      else
-        JavaScript::Expression.new(pageFunction).evaluate_handle(@channel)
-      end
+      JavaScript::Expression.new(pageFunction, arg).evaluate_handle(@channel)
     end
 
     def get_properties

data/lib/playwright/channel_owners/page.rb

@@ -30,6 +30,7 @@ module Playwright
       @frames << @main_frame
       @opener = ChannelOwners::Page.from_nullable(@initializer['opener'])
 
+      @channel.on('bindingCall', ->(params) { on_binding(ChannelOwners::BindingCall.from(params['binding'])) })
       @channel.once('close', ->(_) { on_close })
       @channel.on('console', ->(params) {
         console_message = ChannelOwners::ConsoleMessage.from(params['message'])
@@ -56,25 +57,6 @@ module Playwright
       @channel.on('pageError', ->(params) {
         emit(Events::Page::PageError, Error.parse(params['error']['error']))
       })
-      @channel.on('request', ->(params) {
-        emit(Events::Page::Request, ChannelOwners::Request.from(params['request']))
-      })
-      @channel.on('requestFailed', ->(params) {
-        on_request_failed(
-          ChannelOwners::Request.from(params['request']),
-          params['responseEndTiming'],
-          params['failureText'],
-        )
-      })
-      @channel.on('requestFinished', ->(params) {
-        on_request_finished(
-          ChannelOwners::Request.from(params['request']),
-          params['responseEndTiming'],
-        )
-      })
-      @channel.on('response', ->(params) {
-        emit(Events::Page::Response, ChannelOwners::Response.from(params['response']))
-      })
       @channel.on('route', ->(params) {
         on_route(ChannelOwners::Route.from(params['route']), ChannelOwners::Request.from(params['request']))
       })
@@ -83,7 +65,8 @@ module Playwright
         emit(Events::Page::WebSocket, ChannelOwners::WebSocket.from(params['webSocket']))
       })
       @channel.on('worker', ->(params) {
-        on_worker(ChannelOwners::Worker.from(params['worker']))
+        worker = ChannelOwners::Worker.from(params['worker'])
+        # on_worker(worker)
       })
     end
 
@@ -95,17 +78,6 @@ module Playwright
       :viewport_size,
       :main_frame
 
-    private def on_request_failed(request, response_end_timing, failure_text)
-      request.send(:update_failure_text, failure_text)
-      request.send(:update_response_end_timing, response_end_timing)
-      emit(Events::Page::RequestFailed, request)
-    end
-
-    private def on_request_finished(request, response_end_timing)
-      request.send(:update_response_end_timing, response_end_timing)
-      emit(Events::Page::RequestFinished, request)
-    end
-
     private def on_frame_attached(frame)
       frame.send(:update_page_from_page, self)
       @frames << frame
@@ -130,6 +102,14 @@ module Playwright
       end
     end
 
+    private def on_binding(binding_call)
+      func = @bindings[binding_call.name]
+      if func
+        binding_call.call_async(func)
+      end
+      @browser_context.send(:on_binding, binding_call)
+    end
+
     private def on_close
       @closed = true
       @browser_context.send(:remove_page, self)
@@ -145,6 +125,7 @@ module Playwright
 
     private def on_download(params)
       download = Download.new(
+        page: self,
         url: params['url'],
         suggested_filename: params['suggestedFilename'],
         artifact: ChannelOwners::Artifact.from(params['artifact']),
@@ -335,7 +316,7 @@ module Playwright
         timeout: timeout,
         waitUntil: waitUntil,
       }.compact
-      resp = @channel.send_message_to_server('reoad', params)
+      resp = @channel.send_message_to_server('reload', params)
       ChannelOwners::Response.from_nullable(resp)
     end
 
@@ -359,10 +340,11 @@ module Playwright
       ChannelOwners::Response.from_nullable(resp)
     end
 
-    def emulate_media(colorScheme: nil, media: nil)
+    def emulate_media(colorScheme: nil, media: nil, reducedMotion: nil)
       params = {
         colorScheme: colorScheme,
         media: media,
+        reducedMotion: reducedMotion,
       }.compact
       @channel.send_message_to_server('emulateMedia', params)
 
@@ -464,7 +446,8 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
-          timeout: nil)
+          timeout: nil,
+          trial: nil)
 
       @main_frame.click(
         selector,
@@ -476,6 +459,7 @@ module Playwright
         noWaitAfter: noWaitAfter,
         position: position,
         timeout: timeout,
+        trial: trial,
       )
     end
 
@@ -487,7 +471,8 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
-          timeout: nil)
+          timeout: nil,
+          trial: nil)
       @main_frame.dblclick(
         selector,
         button: button,
@@ -497,6 +482,7 @@ module Playwright
         noWaitAfter: noWaitAfter,
         position: position,
         timeout: timeout,
+        trial: trial,
       )
     end
 
@@ -506,7 +492,8 @@ module Playwright
           modifiers: nil,
           noWaitAfter: nil,
           position: nil,
-          timeout: nil)
+          timeout: nil,
+          trial: nil)
       @main_frame.tap_point(
         selector,
         force: force,
@@ -514,6 +501,7 @@ module Playwright
         noWaitAfter: noWaitAfter,
         position: position,
         timeout: timeout,
+        trial: trial,
       )
     end
 
@@ -546,13 +534,15 @@ module Playwright
           force: nil,
           modifiers: nil,
           position: nil,
-          timeout: nil)
+          timeout: nil,
+          trial: nil)
       @main_frame.hover(
         selector,
         force: force,
         modifiers: modifiers,
         position: position,
         timeout: timeout,
+        trial: trial,
       )
     end
 
@@ -604,9 +594,10 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
-      timeout: nil)
+      timeout: nil,
+      trial: nil)
 
-      @main_frame.check(selector, force: force, noWaitAfter: noWaitAfter, position: position, timeout: timeout)
+      @main_frame.check(selector, force: force, noWaitAfter: noWaitAfter, position: position, timeout: timeout, trial: trial)
     end
 
     def uncheck(
@@ -614,9 +605,10 @@ module Playwright
       force: nil,
       noWaitAfter: nil,
       position: nil,
-      timeout: nil)
+      timeout: nil,
+      trial: nil)
 
-      @main_frame.uncheck(selector, force: force, noWaitAfter: noWaitAfter, position: position, timeout: timeout)
+      @main_frame.uncheck(selector, force: force, noWaitAfter: noWaitAfter, position: position, timeout: timeout, trial: trial)
     end
 
     def wait_for_function(pageFunction, arg: nil, polling: nil, timeout: nil)
@@ -723,7 +715,6 @@ module Playwright
       end
 
       wait_helper.wait_for_event(self, event, predicate: predicate)
-
       block&.call
 
       wait_helper.promise.value!
@@ -753,7 +744,7 @@ module Playwright
       expect_event(Events::Page::Popup, predicate: predicate, timeout: timeout, &block)
     end
 
-    def expect_request(urlOrPredicate, timeout: nil)
+    def expect_request(urlOrPredicate, timeout: nil, &block)
       predicate =
         case urlOrPredicate
         when String, Regexp
@@ -765,10 +756,10 @@ module Playwright
           -> (_) { true }
         end
 
-      expect_event(Events::Page::Request, predicate: predicate, timeout: timeout)
+      expect_event(Events::Page::Request, predicate: predicate, timeout: timeout, &block)
     end
 
-    def expect_response(urlOrPredicate, timeout: nil)
+    def expect_response(urlOrPredicate, timeout: nil, &block)
       predicate =
         case urlOrPredicate
         when String, Regexp
@@ -780,13 +771,7 @@ module Playwright
           -> (_) { true }
         end
 
-      expect_event(Events::Page::Response, predicate: predicate, timeout: timeout)
-    end
-
-    # called from BrowserContext#on_page with send(:update_browser_context, page), so keep private.
-    private def update_browser_context(context)
-      @browser_context = context
-      @timeout_settings = TimeoutSettings.new(context.send(:_timeout_settings))
+      expect_event(Events::Page::Response, predicate: predicate, timeout: timeout, &block)
     end
 
     # called from Frame with send(:timeout_settings)

data/lib/playwright/channel_owners/worker.rb

@@ -0,0 +1,4 @@
+module Playwright
+  define_channel_owner :Worker do
+  end
+end

data/lib/playwright/download.rb

@@ -1,12 +1,13 @@
 module Playwright
   class Download
-    def initialize(url:, suggested_filename:, artifact:)
+    def initialize(page:, url:, suggested_filename:, artifact:)
+      @page = page
       @url = url
       @suggested_filename = suggested_filename
       @artifact = artifact
     end
 
-    attr_reader :url, :suggested_filename
+    attr_reader :page, :url, :suggested_filename
 
     def delete
       @artifact.delete

data/lib/playwright/events.rb

@@ -28,6 +28,10 @@ end
     Close: 'close',
     Page: 'page',
     ServiceWorker: 'serviceworker',
+    Request: 'request',
+    Response: 'response',
+    RequestFailed: 'requestfailed',
+    RequestFinished: 'requestfinished',
   },
 
   BrowserServer: {

data/lib/playwright/input_files.rb

@@ -1,5 +1,4 @@
 require 'base64'
-require 'mime/types'
 
 module Playwright
   class InputFiles
@@ -19,13 +18,11 @@ module Playwright
         when String
           {
             name: File.basename(file),
-            mimeType: mime_type_for(file),
             buffer: Base64.strict_encode64(File.read(file)),
           }
         when File
           {
             name: File.basename(file.path),
-            mimeType: mime_type_for(file.path),
             buffer: Base64.strict_encode64(file.read),
           }
         else
@@ -33,10 +30,5 @@ module Playwright
         end
       end
     end
-
-    private def mime_type_for(filepath)
-      mime_types = MIME::Types.type_for(filepath)
-      mime_types.first.to_s || 'application/octet-stream'
-    end
   end
 end

data/lib/playwright/javascript.rb

@@ -1,13 +1,3 @@
 require_relative './javascript/expression'
-require_relative './javascript/function'
 require_relative './javascript/value_parser'
 require_relative './javascript/value_serializer'
-
-module Playwright
-  module JavaScript
-    # Detect if str is likely to be a function
-    module_function def function?(str)
-      ['async', 'function'].any? { |key| str.strip.start_with?(key) } || str.include?('=>')
-    end
-  end
-end

data/lib/playwright/javascript/expression.rb

@@ -1,16 +1,15 @@
 module Playwright
   module JavaScript
     class Expression
-      def initialize(expression)
+      def initialize(expression, arg)
         @expression = expression
-        @serialized_arg = ValueSerializer.new(nil).serialize
+        @serialized_arg = ValueSerializer.new(arg).serialize
       end
 
       def evaluate(channel)
         value = channel.send_message_to_server(
           'evaluateExpression',
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ValueParser.new(value).parse
@@ -20,7 +19,6 @@ module Playwright
         resp = channel.send_message_to_server(
           'evaluateExpressionHandle',
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ::Playwright::ChannelOwner.from(resp)
@@ -31,7 +29,6 @@ module Playwright
           'evalOnSelector',
           selector: selector,
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ValueParser.new(value).parse
@@ -42,7 +39,6 @@ module Playwright
           'evalOnSelectorAll',
           selector: selector,
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
         )
         ValueParser.new(value).parse
@@ -51,7 +47,6 @@ module Playwright
       def wait_for_function(channel, polling:, timeout:)
         params = {
           expression: @expression,
-          isFunction: false,
           arg: @serialized_arg,
           polling: polling,
           timeout: timeout,

data/lib/playwright/playwright_api.rb

@@ -18,6 +18,17 @@ module Playwright
       end
     end
 
+    # Unwrap ChannelOwner / ApiImplementation.
+    # @note Intended for internal use only.
+    def self.unwrap(api)
+      case api
+      when PlaywrightApi
+        api.instance_variable_get(:@impl)
+      else
+        api
+      end
+    end
+
     class ChannelOwnerWrapper
       def initialize(impl)
         impl_class_name = impl.class.name
@@ -114,6 +125,8 @@ module Playwright
     private def wrap_impl(object)
       if object.is_a?(Array)
         object.map { |obj| wrap_impl(obj) }
+      elsif object.is_a?(Hash)
+        object.map { |key, obj| [key, wrap_impl(obj)] }.to_h
       else
         ::Playwright::PlaywrightApi.wrap(object)
       end
@@ -122,8 +135,10 @@ module Playwright
     private def unwrap_impl(object)
       if object.is_a?(Array)
         object.map { |obj| unwrap_impl(obj) }
+      elsif object.is_a?(Hash)
+        object.map { |key, obj| [key, unwrap_impl(obj)] }.to_h
       elsif object.is_a?(PlaywrightApi)
-        object.instance_variable_get(:@impl)
+        ::Playwright::PlaywrightApi.unwrap(object)
       else
         object
       end

data/lib/playwright/tracing_impl.rb

@@ -0,0 +1,31 @@
+module Playwright
+  define_api_implementation :TracingImpl do
+    def initialize(channel, context)
+      @channel = channel
+      @context = context
+    end
+
+    def start(name: nil, screenshots: nil, snapshots: nil)
+      params = {
+        name: name,
+        screenshots: screenshots,
+        snapshots: snapshots,
+      }.compact
+      @channel.send_message_to_server('tracingStart', params)
+    end
+
+    # Stop tracing.
+    def stop(path: nil)
+      @channel.send_message_to_server('tracingStop')
+
+      if path
+        resp = @channel.send_message_to_server('tracingExport')
+        artifact = ChannelOwners::Artifact.from(resp)
+        # if self._context._browser:
+        #   artifact._is_remote = self._context._browser._is_remote
+        artifact.save_as(path)
+        artifact.delete
+      end
+    end
+  end
+end