playwright-ruby-client 1.33.0 → 1.34.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebc7a6ffab254ce53486bcaf8ad642a42fbadd77f33f48598ee721935f795c98
-  data.tar.gz: bf6473ce5c3ea31bdcca4f072b68aeb4b1b49b0ffb24cc39a7d17955e5de49cf
+  metadata.gz: 64c373804c3cc418f35774036436563714c4e7a42ce87d9ce242d961814c28f9
+  data.tar.gz: 3dccf880e4d4911279bbac84575f03872284c379fdcac468fa4e16940b51c352
 SHA512:
-  metadata.gz: 1e36fed96c70031d7b78ffffe1b3408251fb86b64afb634304d8fe3434b263de696e99b42cb330bb75b2f68a80683caf56e050dddf1b9ead61d97f2dd885b270
-  data.tar.gz: eb7607a301b420b0c3c587dfa562eccf459a943e425da930c7739a2faccb46888dbfeb84bd83953ef8eb1446322cdc8cd4c4e58f3ca71515999e11dfcd3ba121
+  metadata.gz: e911b7eac54e773e83c18efcc13562500e736b75fc259da2f63abed7bc31b716d86b568215c410245fd613a379a3c0fdb63a3a9d942b33042eaf14019829474b
+  data.tar.gz: 47ce8a3dd0a37c79c4786f3d1b34ce99009ee3a572b1d88345d3ae6da767c81cc4f6f0bb9e14c93292dfe4e007f229dd37861a1e358544f787f1aa463792b1f0

data/documentation/docs/api/browser_context.md

@@ -451,6 +451,17 @@ def unroute(url, handler: nil)
 Removes a route created with [BrowserContext#route](./browser_context#route). When `handler` is not specified, removes all
 routes for the `url`.
 
+## expect_console_message
+
+```
+def expect_console_message(predicate: nil, timeout: nil, &block)
+```
+
+
+Performs action and waits for a [ConsoleMessage](./console_message) to be logged by in the pages in the context. If predicate is provided, it passes
+[ConsoleMessage](./console_message) value into the `predicate` function and waits for `predicate(message)` to return a truthy value.
+Will throw an error if the page is closed before the [`event: BrowserContext.console`] event is fired.
+
 ## expect_event
 
 ```
@@ -472,7 +483,7 @@ end
 ## expect_page
 
 ```
-def expect_page(predicate: nil, timeout: nil)
+def expect_page(predicate: nil, timeout: nil, &block)
 ```
 
 

data/documentation/docs/api/console_message.md

@@ -49,6 +49,15 @@ def location
 
 
 
+## page
+
+```
+def page
+```
+
+
+The page that produced this console message, if any.
+
 ## text
 
 ```

data/documentation/docs/api/dialog.md

@@ -65,6 +65,15 @@ def message
 
 A message displayed in the dialog.
 
+## page
+
+```
+def page
+```
+
+
+The page that initiated this dialog, if available.
+
 ## type
 
 ```

data/documentation/docs/api/locator.md

@@ -64,6 +64,23 @@ Returns an array of `node.textContent` values for all matching nodes.
 texts = page.get_by_role("link").all_text_contents
 ```
 
+## and
+
+```
+def and(locator)
+```
+
+
+Creates a locator that matches both this locator and the argument locator.
+
+**Usage**
+
+The following example finds a button with a specific title.
+
+```ruby
+button = page.get_by_role("button").and(page.get_by_title("Subscribe"))
+```
+
 ## blur
 
 ```

data/documentation/docs/api/route.md

@@ -84,7 +84,7 @@ def handle_post(route, request)
 end
 
 # Handle POST requests.
-def handle_post(route)
+def handle_post(route, request)
   if request.method != "POST"
     route.fallback
     return

data/documentation/docs/include/api_coverage.md

@@ -218,6 +218,7 @@
 
 * args
 * location
+* page
 * text
 * type
 
@@ -227,6 +228,7 @@
 * default_value
 * dismiss
 * message
+* page
 * type
 
 ## Download
@@ -367,6 +369,7 @@
 * set_offline
 * storage_state
 * unroute
+* expect_console_message
 * expect_event
 * expect_page
 * ~~wait_for_event~~
@@ -422,6 +425,7 @@
 * all
 * all_inner_texts
 * all_text_contents
+* and
 * blur
 * bounding_box
 * check

data/lib/playwright/channel_owners/browser_context.rb

@@ -35,6 +35,12 @@ module Playwright
       @channel.on('serviceWorker', ->(params) {
         on_service_worker(ChannelOwners::Worker.from(params['worker']))
       })
+      @channel.on('console', ->(params) {
+        on_console_message(ChannelOwners::ConsoleMessage.from(params['message']))
+      })
+      @channel.on('dialog', ->(params) {
+        on_dialog(ChannelOwners::Dialog.from(params['dialog']))
+      })
       @channel.on('request', ->(params) {
         on_request(
           ChannelOwners::Request.from(params['request']),
@@ -57,6 +63,8 @@ module Playwright
         )
       })
       set_event_to_subscription_mapping({
+        Events::BrowserContext::Console => 'console',
+        Events::BrowserContext::Dialog => 'dialog',
         Events::BrowserContext::Request => "request",
         Events::BrowserContext::Response => "response",
         Events::BrowserContext::RequestFinished => "requestFinished",
@@ -147,6 +155,28 @@ module Playwright
       response&.send(:mark_as_finished)
     end
 
+    private def on_console_message(message)
+      emit(Events::BrowserContext::Console, message)
+      if (page = message.page)
+        page.emit(Events::Page::Console, message)
+      end
+    end
+
+    private def on_dialog(dialog)
+      consumed_by_context = emit(Events::BrowserContext::Dialog, dialog)
+      if (page = dialog.page)
+        consumed_by_page = page.emit(Events::Page::Dialog, dialog)
+      end
+
+      if !consumed_by_context && !consumed_by_page
+        if dialog.type == 'beforeunload'
+          dialog.accept_async
+        else
+          dialog.dismiss
+        end
+      end
+    end
+
     private def on_request(request, page)
       emit(Events::BrowserContext::Request, request)
       page&.emit(Events::Page::Request, request)
@@ -414,12 +444,20 @@ module Playwright
       end
     end
 
-    def expect_page(predicate: nil, timeout: nil)
+    def expect_console_message(predicate: nil, timeout: nil, &block)
+      params = {
+        predicate: predicate,
+        timeout: timeout,
+      }.compact
+      expect_event(Events::BrowserContext::Console, params, &block)
+    end
+
+    def expect_page(predicate: nil, timeout: nil, &block)
       params = {
         predicate: predicate,
         timeout: timeout,
       }.compact
-      expect_event(Events::BrowserContext::Page, params)
+      expect_event(Events::BrowserContext::Page, params, &block)
     end
 
     # called from Page#on_close with send(:remove_page, page), so keep private

data/lib/playwright/channel_owners/console_message.rb

@@ -1,5 +1,9 @@
 module Playwright
   define_channel_owner :ConsoleMessage do
+    def page
+      @page ||= ChannelOwners::Page.from_nullable(@initializer['page'])
+    end
+
     def type
       @initializer['type']
     end

data/lib/playwright/channel_owners/dialog.rb

@@ -1,5 +1,9 @@
 module Playwright
   define_channel_owner :Dialog do
+    def page
+      @page ||= ChannelOwners::Page.from_nullable(@initializer['page'])
+    end
+
     def type
       @initializer['type']
     end

data/lib/playwright/channel_owners/page.rb

@@ -36,12 +36,7 @@ module Playwright
 
       @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'])
-        emit(Events::Page::Console, console_message)
-      })
       @channel.on('crash', ->(_) { emit(Events::Page::Crash) })
-      @channel.on('dialog', method(:on_dialog))
       @channel.on('download', method(:on_download))
       @channel.on('fileChooser', ->(params) {
         chooser = FileChooserImpl.new(
@@ -70,6 +65,8 @@ module Playwright
       })
 
       set_event_to_subscription_mapping({
+        Events::Page::Console => "console",
+        Events::Page::Dialog => "dialog",
         Events::Page::Request => "request",
         Events::Page::Response => "response",
         Events::Page::RequestFinished => "requestFinished",
@@ -151,13 +148,6 @@ module Playwright
       emit(Events::Page::Close)
     end
 
-    private def on_dialog(params)
-      dialog = ChannelOwners::Dialog.from(params['dialog'])
-      unless emit(Events::Page::Dialog, dialog)
-        dialog.dismiss
-      end
-    end
-
     private def on_download(params)
       artifact = ChannelOwners::Artifact.from(params['artifact'])
       download = DownloadImpl.new(

data/lib/playwright/events.rb

@@ -26,6 +26,8 @@ end
   BrowserContext: {
     BackgroundPage: 'backgroundpage',
     Close: 'close',
+    Console: 'console',
+    Dialog: 'dialog',
     Page: 'page',
     ServiceWorker: 'serviceworker',
     Request: 'request',

data/lib/playwright/locator_impl.rb

@@ -268,9 +268,20 @@ module Playwright
       )
     end
 
+    def and(locator)
+      unless same_frame?(locator)
+        raise DifferentFrameError.new('and')
+      end
+      LocatorImpl.new(
+        frame: @frame,
+        timeout_settings: @timeout_settings,
+        selector: "#{@selector} >> internal:and=#{locator.send(:selector_json)}",
+      )
+    end
+
     def or(locator)
       unless same_frame?(locator)
-        raise DifferentFrameError.new('locator')
+        raise DifferentFrameError.new('or')
       end
       LocatorImpl.new(
         frame: @frame,

data/lib/playwright/locator_utils.rb

@@ -39,7 +39,7 @@ module Playwright
     end
 
     private def get_by_test_id_selector(test_id_attribute_name, test_id)
-      "internal:testid=[#{test_id_attribute_name}=#{escape_for_attribute_selector(test_id, true)}]"
+      "internal:testid=[#{test_id_attribute_name}=#{escape_for_attribute_selector_or_regex(test_id, true)}]"
     end
 
     private def get_by_label_selector(text, exact:)

data/lib/playwright/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Playwright
-  VERSION = '1.33.0'
-  COMPATIBLE_PLAYWRIGHT_VERSION = '1.33.0'
+  VERSION = '1.34.0'
+  COMPATIBLE_PLAYWRIGHT_VERSION = '1.34.3'
 end

data/lib/playwright.rb

@@ -74,7 +74,7 @@ module Playwright
   #   ...
   # end
   #
-  # When we use this method without block, an instance of Puppeteer::Execution is returned
+  # When we use this method without block, an instance of Playwright::Execution is returned
   # and we *must* call execution.stop on the end.
   # The instance of playwright is available by calling execution.playwright
   module_function def create(playwright_cli_executable_path:, &block)

data/lib/playwright_api/browser_context.rb

@@ -391,6 +391,14 @@ module Playwright
       wrap_impl(@impl.unroute(unwrap_impl(url), handler: unwrap_impl(handler)))
     end
 
+    #
+    # Performs action and waits for a `ConsoleMessage` to be logged by in the pages in the context. If predicate is provided, it passes
+    # `ConsoleMessage` value into the `predicate` function and waits for `predicate(message)` to return a truthy value.
+    # Will throw an error if the page is closed before the [`event: BrowserContext.console`] event is fired.
+    def expect_console_message(predicate: nil, timeout: nil, &block)
+      wrap_impl(@impl.expect_console_message(predicate: unwrap_impl(predicate), timeout: unwrap_impl(timeout), &wrap_block_call(block)))
+    end
+
     #
     # Waits for event to fire and passes its value into the predicate function. Returns when the predicate returns truthy
     # value. Will throw an error if the context closes before the event is fired. Returns the event data value.
@@ -410,8 +418,8 @@ module Playwright
     # Performs action and waits for a new `Page` to be created in the context. If predicate is provided, it passes
     # `Page` value into the `predicate` function and waits for `predicate(event)` to return a truthy value.
     # Will throw an error if the context closes before new `Page` is created.
-    def expect_page(predicate: nil, timeout: nil)
-      wrap_impl(@impl.expect_page(predicate: unwrap_impl(predicate), timeout: unwrap_impl(timeout)))
+    def expect_page(predicate: nil, timeout: nil, &block)
+      wrap_impl(@impl.expect_page(predicate: unwrap_impl(predicate), timeout: unwrap_impl(timeout), &wrap_block_call(block)))
     end
 
     #

data/lib/playwright_api/console_message.rb

@@ -33,6 +33,12 @@ module Playwright
       wrap_impl(@impl.location)
     end
 
+    #
+    # The page that produced this console message, if any.
+    def page
+      wrap_impl(@impl.page)
+    end
+
     #
     # The text of the console message.
     def text

data/lib/playwright_api/dialog.rb

@@ -51,6 +51,12 @@ module Playwright
       wrap_impl(@impl.message)
     end
 
+    #
+    # The page that initiated this dialog, if available.
+    def page
+      wrap_impl(@impl.page)
+    end
+
     #
     # Returns dialog's type, can be one of `alert`, `beforeunload`, `confirm` or `prompt`.
     def type

data/lib/playwright_api/locator.rb

@@ -50,6 +50,20 @@ module Playwright
       wrap_impl(@impl.all_text_contents)
     end
 
+    #
+    # Creates a locator that matches both this locator and the argument locator.
+    #
+    # **Usage**
+    #
+    # The following example finds a button with a specific title.
+    #
+    # ```python sync
+    # button = page.get_by_role("button").and_(page.getByTitle("Subscribe"))
+    # ```
+    def and(locator)
+      wrap_impl(@impl.and(unwrap_impl(locator)))
+    end
+
     #
     # Calls [blur](https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/blur) on the element.
     def blur(timeout: nil)

data/lib/playwright_api/page.rb

@@ -1672,11 +1672,6 @@ module Playwright
       raise NotImplementedError.new('wait_for_event is not implemented yet.')
     end
 
-    # @nodoc
-    def stop_css_coverage
-      wrap_impl(@impl.stop_css_coverage)
-    end
-
     # @nodoc
     def owned_context=(req)
       wrap_impl(@impl.owned_context=(unwrap_impl(req)))
@@ -1702,6 +1697,11 @@ module Playwright
       wrap_impl(@impl.start_css_coverage(resetOnNavigation: unwrap_impl(resetOnNavigation), reportAnonymousScripts: unwrap_impl(reportAnonymousScripts)))
     end
 
+    # @nodoc
+    def stop_css_coverage
+      wrap_impl(@impl.stop_css_coverage)
+    end
+
     # -- inherited from EventEmitter --
     # @nodoc
     def off(event, callback)

data/lib/playwright_api/route.rb

@@ -57,7 +57,7 @@ module Playwright
     #
     # ```python sync
     # # Handle GET requests.
-    # def handle_post(route):
+    # def handle_get(route):
     #     if route.request.method != "GET":
     #         route.fallback()
     #         return

data/lib/playwright_api/worker.rb

@@ -47,13 +47,13 @@ module Playwright
     end
 
     # @nodoc
-    def page=(req)
-      wrap_impl(@impl.page=(unwrap_impl(req)))
+    def context=(req)
+      wrap_impl(@impl.context=(unwrap_impl(req)))
     end
 
     # @nodoc
-    def context=(req)
-      wrap_impl(@impl.context=(unwrap_impl(req)))
+    def page=(req)
+      wrap_impl(@impl.page=(unwrap_impl(req)))
     end
 
     # -- inherited from EventEmitter --

data/sig/playwright.rbs

@@ -223,6 +223,7 @@ module Playwright
   class ConsoleMessage
     def args: -> Array[untyped]
     def location: -> Hash[untyped, untyped]
+    def page: -> (nil | Page)
     def text: -> String
     def type: -> String
   end
@@ -232,6 +233,7 @@ module Playwright
     def default_value: -> String
     def dismiss: -> void
     def message: -> String
+    def page: -> (nil | Page)
     def type: -> String
   end
 
@@ -382,8 +384,9 @@ module Playwright
     def offline=: (bool offline) -> void
     def storage_state: (?path: (String | File)) -> Hash[untyped, untyped]
     def unroute: ((String | Regexp | function) url, ?handler: function) -> void
+    def expect_console_message: (?predicate: function, ?timeout: Float) { () -> void } -> ConsoleMessage
     def expect_event: (String event, ?predicate: function, ?timeout: Float) { () -> void } -> untyped
-    def expect_page: (?predicate: function, ?timeout: Float) -> Page
+    def expect_page: (?predicate: function, ?timeout: Float) { () -> void } -> Page
 
     attr_reader request: APIRequestContext
     attr_reader tracing: Tracing
@@ -434,6 +437,7 @@ module Playwright
     def all: -> Array[untyped]
     def all_inner_texts: -> Array[untyped]
     def all_text_contents: -> Array[untyped]
+    def and: (Locator locator) -> Locator
     def blur: (?timeout: Float) -> void
     def bounding_box: (?timeout: Float) -> (nil | Hash[untyped, untyped])
     def check: (?force: bool, ?noWaitAfter: bool, ?position: Hash[untyped, untyped], ?timeout: Float, ?trial: bool) -> void

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: playwright-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.33.0
+  version: 1.34.0
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-04-29 00:00:00.000000000 Z
+date: 2023-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -401,5 +401,5 @@ requirements: []
 rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
-summary: The Ruby binding of playwright driver 1.33.0
+summary: The Ruby binding of playwright driver 1.34.3
 test_files: []