dvla-browser-drivers 3.1.0 → 3.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ac07160d1bc1d37efd9b23fca6eb49e7b591c63394322b7c2bd1c65328568523
-  data.tar.gz: baaf5af95ef7185e130b5f6ae6ef1d4b00620b18d0a2490607aaa5e8a460a566
+  metadata.gz: be6fbb0dea13bdb8c0cffdf3c2e865a707792e92ad0779d27ee9e9ca69c31d37
+  data.tar.gz: f17d454ef4b54fcf99adffa8bb9d62872a03740bf54671923183245b33bad027
 SHA512:
-  metadata.gz: 109149e21784a203260a5c0bed209b53cfe998f4fb71ae5199a8aa605e2e4455b5d09ac574e8f8ffb33974dd76f9fa99c73768a2db6e3a5fed319c9854f43e4c
-  data.tar.gz: 7a795f13005830a63ecbd8c780a474798626eaf3dbaee5b5ca33a3bb572000fd18c8f517e727abd538cab21cc5cd861cf2c3c49b3dde5ac0ab7337af2b7548b8
+  metadata.gz: 41730ce1a0217eb34d5ae46722d6387bac90dbbfe869bce8a9ba5f60f32a54290cab759327fdb870da109d8e5c8daa1eb4c4e730b98190c261d3b40904775ba2
+  data.tar.gz: 16988c0eb23835442a45f68f07d9d2c0132980888b4cc983600d33e34ea654a0a4c57df7bde4b41a1ebb0f241e5f1422d066584da93a5da0f09ecd9956219f4f

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 All notable changes to this project will be documented in this file.
 
 
+# [3.1.2] - 2026-01-19
+
+- Remove dvla-herodotus dependency
+
+# [3.1.1] - 2025-12-12
+
+- Add selenium_safari config
+- Add optional binary string for Selenium 
+
 # [3.1.0] - 2025-12-10
 
 - Add websocket URL to enable BiDi functionality via Selenium

data/README.md

@@ -29,10 +29,10 @@ Once installed, you are able to use any pre-configured browser driver from the l
 |---------------------------|----------------------------------------------------|
 | selenium_chrome           | `DVLA::Browser::Drivers.selenium_chrome`           |
 | headless_selenium_chrome  | `DVLA::Browser::Drivers.headless_selenium_chrome`  |
-| selenium_edge             | `DVLA::Browser::Drivers.selenium_edge`             |
-| headless_selenium_edge    | `DVLA::Browser::Drivers.headless_selenium_edge`    |
 | selenium_firefox          | `DVLA::Browser::Drivers.selenium_firefox`          |
 | headless_selenium_firefox | `DVLA::Browser::Drivers.headless_selenium_firefox` |
+| selenium_edge             | `DVLA::Browser::Drivers.selenium_edge`             |
+| selenium_safari           | `DVLA::Browser::Drivers.selenium_safari`           |
 
 ### Non-selenium drivers
 
@@ -43,6 +43,8 @@ Once installed, you are able to use any pre-configured browser driver from the l
 | apparition          | `DVLA::Browser::Drivers.apparition`          |
 | headless_apparition | `DVLA::Browser::Drivers.headless_apparition` |
 
+**Note:** Safari and Edge do not support headless mode. 
+
 ---
 
 ### Default configuration

data/dvla-browser-drivers.gemspec

@@ -48,6 +48,5 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'apparition', '>= 0.6'
   spec.add_dependency 'capybara', '>= 3.37'
   spec.add_dependency 'cuprite', '>= 0.14'
-  spec.add_dependency 'dvla-herodotus', '>= 2.0'
   spec.add_dependency 'selenium-webdriver', '>= 4.0'
 end

data/lib/dvla/browser/drivers/meta_drivers.rb

@@ -1,12 +1,12 @@
 module DVLA
   module Browser
     module Drivers
-      DRIVER_REGEX = /^(?:(?<headless>headless)_)?(?<driver>(selenium_(?<browser>chrome|firefox|edge)|cuprite|apparition))$/
+      DRIVER_REGEX = /^(?:(?<headless>headless_)(?<driver>selenium_(?<browser>chrome|firefox)|cuprite|apparition)|(?<driver_no_headless>selenium_(?<browser_no_headless>chrome|firefox|edge|safari)|cuprite|apparition))$/
 
       OTHER_ACCEPTED_PARAMS = %i[timeout browser_options save_path remote].freeze
       OTHER_DRIVERS = %i[cuprite apparition].freeze
-      SELENIUM_ACCEPTED_PARAMS = %i[remote additional_arguments additional_preferences].freeze
-      SELENIUM_DRIVERS = %i[selenium_chrome selenium_firefox selenium_edge].freeze
+      SELENIUM_ACCEPTED_PARAMS = %i[remote additional_arguments additional_preferences binary].freeze
+      SELENIUM_DRIVERS = %i[selenium_chrome selenium_firefox selenium_edge selenium_safari].freeze
 
       # Creates methods in the Drivers module that matches the DRIVER_REGEX
       # These methods will register a Driver for use by Capybara in a test pack
@@ -19,35 +19,39 @@ module DVLA
       def self.method_missing(method, *args, **kwargs, &)
         if (matches = method.match(DRIVER_REGEX))
           headless = matches[:headless].is_a? String
-          driver = matches[:driver].to_sym
+          driver = matches[:driver]&.to_sym || matches[:driver_no_headless]&.to_sym
+          browser_match = matches[:browser] || matches[:browser_no_headless]
 
           case driver
           when *SELENIUM_DRIVERS
-            browser = matches[:browser].to_sym
+            browser = browser_match.to_sym
 
             kwargs.each do |key, _value|
-              LOG.warn { "Key: '#{key}' will be ignored | Use one from: '#{SELENIUM_ACCEPTED_PARAMS}'" } unless SELENIUM_ACCEPTED_PARAMS.include?(key)
+              puts "Key: '#{key}' will be ignored | Use one from: '#{SELENIUM_ACCEPTED_PARAMS}'" unless SELENIUM_ACCEPTED_PARAMS.include?(key)
             end
 
             ::Capybara.register_driver method do |app|
-              options = Object.const_get("Selenium::WebDriver::#{browser.to_s.capitalize}::Options").new(web_socket_url: true)
-              options.add_argument('--disable-dev-shm-usage')
-
-              if headless
-                options.add_argument('--headless')
-                options.add_argument('--no-sandbox')
-              end
-
-              browser = :remote if kwargs[:remote]
-
-              kwargs[:additional_arguments] && kwargs[:additional_arguments].each do |argument|
-                argument.prepend('--') unless argument.start_with?('--')
-                options.add_argument(argument)
-              end
-
-              kwargs[:additional_preferences] && kwargs[:additional_preferences].each do |preference|
-                key, value = preference.first
-                options.add_preference(key, value)
+              if browser == :safari
+                options = Selenium::WebDriver::Safari::Options.new
+              else
+                options = Object.const_get("Selenium::WebDriver::#{browser.to_s.capitalize}::Options").new(web_socket_url: true)
+                options.binary = kwargs[:binary] if kwargs[:binary]
+                options.add_argument('--disable-dev-shm-usage')
+
+                if headless
+                  options.add_argument('--headless')
+                  options.add_argument('--no-sandbox')
+                end
+
+                kwargs[:additional_arguments] && kwargs[:additional_arguments].each do |argument|
+                  argument.prepend('--') unless argument.start_with?('--')
+                  options.add_argument(argument)
+                end
+
+                kwargs[:additional_preferences] && kwargs[:additional_preferences].each do |preference|
+                  key, value = preference.first
+                  options.add_preference(key, value)
+                end
               end
 
               driver_browser = kwargs[:remote] ? :remote : browser
@@ -58,7 +62,7 @@ module DVLA
             end
           else
             kwargs.each do |key, _value|
-              LOG.warn { "Key: '#{key}' will be ignored | Use one from: '#{OTHER_ACCEPTED_PARAMS}'" } unless OTHER_ACCEPTED_PARAMS.include?(key)
+              puts "Key: '#{key}' will be ignored | Use one from: '#{OTHER_ACCEPTED_PARAMS}'" unless OTHER_ACCEPTED_PARAMS.include?(key)
             end
 
             browser_options = { 'no-sandbox': nil, 'disable-smooth-scrolling': true }
@@ -78,7 +82,7 @@ module DVLA
             end
           end
 
-          LOG.info { "Driver set to: '#{method}'" }
+          puts  "Driver set to: '#{method}'"
 
           ::Capybara.javascript_driver = method
           ::Capybara.default_driver = method

data/lib/dvla/browser/drivers/version.rb

@@ -3,7 +3,7 @@
 module DVLA
   module Browser
     module Drivers
-      VERSION = '3.1.0'
+      VERSION = '3.1.2'
     end
   end
 end

data/lib/dvla/browser/drivers.rb

@@ -3,11 +3,8 @@ require_relative 'drivers/version'
 
 require 'capybara/apparition'
 require 'capybara/cuprite'
-require 'dvla/herodotus'
 require 'selenium-webdriver'
 
 module DVLA
   class Error < StandardError; end
-
-  LOG = DVLA::Herodotus.logger('browser-drivers')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dvla-browser-drivers
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.1.2
 platform: ruby
 authors:
 - Driver and Vehicle Licensing Agency (DVLA)
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-12-11 00:00:00.000000000 Z
+date: 2026-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: apparition
@@ -53,20 +53,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.14'
-- !ruby/object:Gem::Dependency
-  name: dvla-herodotus
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement