Merge remote-tracking branch 'upstream/main' into support-time-inputs

Author: Antsiscool

.github/FUNDING.yml

@@ -0,0 +1 @@
+github: rubycdp

.github/gemfiles/websocket-driver-0.6.x.gemfile

@@ -11,13 +11,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        gemfile: [websocket-driver-0.6.x, websocket-driver-0.7.x]
-        ruby: [2.7, "3.0", 3.1, 3.2, 3.3]
+        ruby: ["2.7", "3.0", "3.1", "3.2", "3.3", "3.4"]
     runs-on: ubuntu-latest
     env:
       FERRUM_PROCESS_TIMEOUT: 25
       FERRUM_DEFAULT_TIMEOUT: 15
-      BUNDLE_GEMFILE: .github/gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -33,6 +31,11 @@ jobs:
         with:
           chrome-version: stable
 
+      - name: Fix GA Chrome Permissions
+        run: |
+          sudo chown root:root /opt/hostedtoolcache/setup-chrome/chromium/stable/x64/chrome-sandbox
+          sudo chmod 4755 /opt/hostedtoolcache/setup-chrome/chromium/stable/x64/chrome-sandbox
+
       - name: Run tests
         run: |
           mkdir -p /tmp/cuprite
@@ -42,5 +45,5 @@ jobs:
         uses: actions/upload-artifact@v4
         if: ${{ failure() }}
         with:
-          name: footprints
+          name: artifacts-ruby-v${{ matrix.ruby }}
           path: /tmp/cuprite/

.github/gemfiles/websocket-driver-0.7.x.gemfile

@@ -1,3 +1,3 @@
 --color
---format=doc
+--format=progress
 --require spec_helper

.github/workflows/tests.yml

@@ -16,6 +16,9 @@ Naming/FileName:
   Exclude:
     - 'gemfiles/*.gemfile'
 
+Style/OptionalBooleanParameter:
+  Enabled: false
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

.rspec

@@ -1,9 +1,32 @@
-## [Unreleased](https://github.com/rubycdp/ferrum/compare/v0.15...main) ##
+## [Unreleased](https://github.com/rubycdp/ferrum/compare/v0.15.1...main) ##
 
 ### Added
 
 ### Changed
-- `@window_size` attribute is moved from Ferrum viewport size is still inherited [#253]
+
+### Fixed
+
+### Removed
+
+
+## [0.15.1](https://github.com/rubycdp/ferrum/compare/v0.15...0.15.1) - (Jun 15, 2024) ##
+
+### Added
+
+- Support for `Driver#send_keys`, the `:focused` filter, and `Driver#active_element` [#261]
+
+### Changed
+- `@window_size` attribute is moved from Ferrum, viewport size is still inherited [#253]
+- Compatibility with latest Ferrum. Browser instance is not passed everywhere now [#254]
+  - `Cuprite::Browser` methods are located in `Options`.
+    - `#window_size`
+    - `#url_blacklist`
+    - `#url_whitelist`
+    - `#timeout`
+  - `Page#new` arguments are changed to `client, context_id:, target_id:`
+  - `Target#attached?` renamed to `Target#connected?`
+  - Ferrum doesn't restart browser automatically, Cuprite does
+  - `Browser#close_window` removes target id asap from the target list
 
 ### Fixed
 - Detect whether element is in the viewport and clickable before click [#251]

.rubocop.yml

@@ -6,12 +6,12 @@ gem "byebug", "~> 11.1", platforms: %i[mri mingw x64_mingw]
 gem "chunky_png", "~> 1.4"
 gem "image_size", "~> 3.0"
 gem "launchy", "~> 2.5"
-gem "pdf-reader", "~> 2.5"
+gem "pdf-reader", "~> 2.12"
 gem "puma", ">= 5.6.7"
 gem "rake", "~> 13.0"
 gem "rspec", "~> 3.10"
 gem "rubocop", "~> 1.22"
 gem "rubocop-rake", require: false
-gem "sinatra", "~> 2.1"
+gem "sinatra", "~> 3.2"
 
 gemspec

CHANGELOG.md

@@ -61,8 +61,8 @@ end
 `Cuprite`-specific options are:
 
 * options `Hash`
-  * `:url_blacklist` (Array) - array of strings to match against requested URLs
-  * `:url_whitelist` (Array) - array of strings to match against requested URLs
+  * `:url_blacklist` (Array) - array of regexes to match against requested URLs
+  * `:url_whitelist` (Array) - array of regexes to match against requested URLs
 
 
 ## Debugging
@@ -122,13 +122,17 @@ be automatically cleared at the end of the test.
 
 ## Network traffic
 
-* `page.driver.network_traffic` Inspect network traffic (loaded resources) on
-the current page. This returns an array of request objects.
+* `page.driver.network_traffic` allows you to inspect network traffic (i.e., loaded resources) on the current page. It returns an array of `Ferrum::Network::Exchange` objects, each representing a network request/response exchange. You can query both the request and response details of each exchange.
 
 ```ruby
-page.driver.network_traffic # => [Request, ...]
-request = page.driver.network_traffic.first
-request.response
+# Retrieve all network exchanges
+network_traffic = page.driver.network_traffic
+
+# Access the first exchange
+first_exchange = network_traffic.first
+
+# Inspect the response of the first request
+response = first_exchange.response
 ```
 
 * `page.driver.wait_for_network_idle` Natively waits for network idle and if
@@ -183,27 +187,29 @@ Besides capybara screenshot method you can get image as Base64:
 
 ## Proxy
 
-* `page.driver.set_proxy(ip, port, type, user, password)`
+* `page.driver.set_proxy(ip, port, user, password)`
 
 
-## URL Blacklisting & Whitelisting
+## URL Blocklisting & Allowlisting
 
-Cuprite supports URL blacklisting, which allows you to prevent scripts from
+Cuprite supports URL blocklisting, which allows you to prevent scripts from
 running on designated domains:
 
 ```ruby
-page.driver.browser.url_blacklist = %r{http://www.example.com}
+page.driver.browser.url_blocklist = %r{http://www.example.com}
 ```
 
-and also URL whitelisting, which allows scripts to only run on designated
+and also URL allowlisting, which allows scripts to only run on designated
 domains:
 
 ```ruby
-page.driver.browser.url_whitelist = %r{http://www.example.com}
+page.driver.browser.url_allowlist = %r{http://www.example.com}
 ```
 
-If you are experiencing slower run times, consider creating a URL whitelist of
-domains that are essential or a blacklist of domains that are not essential,
+For legacy support, `url_blacklist=` and `url_whitelist=` continue to work respectively.
+
+If you are experiencing slower run times, consider creating a URL allowlist of
+domains that are essential or a blocklist of domains that are not essential,
 such as ad networks or analytics, to your testing environment.
 
 ## License

Gemfile

@@ -6,6 +6,7 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new("test") do |t|
   t.ruby_opts = "-w"
+  t.rspec_opts = "--format=documentation" if ENV["CI"]
 end
 
 task default: :test