capybara-playwright-driver 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f88314708baa0e7547488ccf9ad93c70f4ab5b4bb9408c5452d013091688034
-  data.tar.gz: 578733ad152ef6065cb9c351e48d43ccabd5a0a9dca644c4ad791b2e7e4e5c5f
+  metadata.gz: 2f43dbe09eba1cda75ed608f418120fbe5daebe99aa4bebde377ef120bd88d3f
+  data.tar.gz: 825d1aa7230177a37c7f6ce23ce656961084a2f13bfe8e5e36674836866a477e
 SHA512:
-  metadata.gz: f77aa0e32476d52e6c3aa875a52b24c2693e7129b22a72ca416f30749b167f14b8846889ce39d2db203ce25e890ff74eac1d13f42f630131e64aaab63a578764
-  data.tar.gz: 9c22919f25f1a0012a98dc1186724553fbdbecc0df10f95b5f80592e8489a3ed20218b19d8dcf3d2df0e467b8ed457606e039d288d28236c42e72c640a121b89
+  metadata.gz: 9f989b332d2d69bf84e3b270478514cee94a1ed3dc40c6868b8c61565248fa0d597e16f1575a42344bd13cbb4ecce8277956813d67df8b407351db72e684778d
+  data.tar.gz: df9dfa30c1f50fb1dc3c037b1b7445308e5301632ec6f8d16ba05f53b071f8a106355ae5d8d59b6885892c70bd7b2b713fe3a6d2f3c763ba528cd37c0c8ec899

data/capybara-playwright.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.4'
   spec.add_dependency 'capybara'
-  spec.add_dependency 'playwright-ruby-client', '>= 0.6.2'
+  spec.add_dependency 'playwright-ruby-client', '>= 0.8.0'
   spec.add_development_dependency 'allure-rspec'
   spec.add_development_dependency 'bundler', '~> 2.2.3'
   spec.add_development_dependency 'launchy', '>= 2.0.4'

data/lib/capybara/playwright/browser_runner.rb

@@ -0,0 +1,99 @@
+module Capybara
+    module Playwright
+      # playwright-ruby-client provides 3 methods to launch/connect browser.
+      #
+      # Playwright.create do |playwright|
+      #   playwright.chromium.launch do |browser|
+      #
+      # Playwright.connect_to_playwright_server do |playwright| ...
+      #   playwright.chromium.launch do |browser|
+      #
+      # Playwright.connect_to_browser_server do |browser| ...
+      #
+      # This class provides start/stop methods for driver.
+      # This is responsible for
+      # - managing PlaywrightExecution
+      # - launching browser with given option if needed
+      class BrowserRunner
+        class PlaywrightConnectToPlaywrightServer
+          def initialize(endpoint_url, options)
+            @ws_endpoint = endpoint_url
+            @browser_type = options[:browser_type] || :chromium
+            unless %i(chromium firefox webkit).include?(@browser_type)
+              raise ArgumentError.new("Unknown browser_type: #{@browser_type}")
+            end
+            @browser_options = BrowserOptions.new(options)
+          end
+
+          def playwright_execution
+            @playwright_execution ||= ::Playwright.connect_to_playwright_server(@ws_endpoint)
+          end
+
+          def playwright_browser
+            browser_type = playwright_execution.playwright.send(@browser_type)
+            browser_options = @browser_options.value
+            browser_type.launch(**browser_options)
+          end
+        end
+
+        class PlaywrightConnectToBrowserServer
+          def initialize(endpoint_url)
+            @ws_endpoint = endpoint_url
+          end
+
+          def playwright_execution
+            @playwright_execution ||= ::Playwright.connect_to_browser_server(@ws_endpoint)
+          end
+
+          def playwright_browser
+            playwright_execution.browser
+          end
+        end
+
+        class PlaywrightCreate
+          def initialize(options)
+            @playwright_cli_executable_path = options[:playwright_cli_executable_path] || 'npx playwright'
+            @browser_type = options[:browser_type] || :chromium
+            unless %i(chromium firefox webkit).include?(@browser_type)
+              raise ArgumentError.new("Unknown browser_type: #{@browser_type}")
+            end
+            @browser_options = BrowserOptions.new(options)
+          end
+
+          def playwright_execution
+            @playwright_execution ||= ::Playwright.create(
+              playwright_cli_executable_path: @playwright_cli_executable_path,
+            )
+          end
+
+          def playwright_browser
+            browser_type = playwright_execution.playwright.send(@browser_type)
+            browser_options = @browser_options.value
+            browser_type.launch(**browser_options)
+          end
+        end
+
+        def initialize(options)
+          @runner =
+            if options[:playwright_server_endpoint_url]
+              PlaywrightConnectToPlaywrightServer.new(options[:playwright_server_endpoint_url], options)
+            elsif options[:browser_server_endpoint_url]
+              PlaywrightConnectToBrowserServer.new(options[:browser_server_endpoint_url])
+            else
+              PlaywrightCreate.new(options)
+            end
+        end
+
+        # @return [::Playwright::Browser]
+        def start
+          @playwright_execution = @runner.playwright_execution
+          @runner.playwright_browser
+        end
+
+        def stop
+          @playwright_execution&.stop
+          @playwright_execution = nil
+        end
+      end
+    end
+  end

data/lib/capybara/playwright/driver.rb

@@ -7,13 +7,7 @@ module Capybara
       include DriverExtension
 
       def initialize(app, **options)
-        @playwright_cli_executable_path = options[:playwright_cli_executable_path] || 'npx playwright'
-        @browser_type = options[:browser_type] || :chromium
-        unless %i(chromium firefox webkit).include?(@browser_type)
-          raise ArgumentError.new("Unknown browser_type: #{@browser_type}")
-        end
-
-        @browser_options = BrowserOptions.new(options)
+        @browser_runner = BrowserRunner.new(options)
         @page_options = PageOptions.new(options)
       end
 
@@ -43,22 +37,13 @@ module Capybara
           exit @exit_status if @exit_status # Force exit with stored status
         end
 
-        browser_type = playwright_execution.playwright.send(@browser_type)
-        browser_options = @browser_options.value
-        browser_type.launch(**browser_options)
-      end
-
-      private def playwright_execution
-        @playwright_execution ||= ::Playwright.create(
-          playwright_cli_executable_path: @playwright_cli_executable_path,
-        )
+        @browser_runner.start
       end
 
       private def quit
         @playwright_browser&.close
         @playwright_browser = nil
-        @playwright_execution&.stop
-        @playwright_execution = nil
+        @browser_runner.stop
       end
 
       def reset!

data/lib/capybara/playwright/version.rb

@@ -2,6 +2,6 @@
 
 module Capybara
   module Playwright
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/lib/capybara/playwright.rb

@@ -4,6 +4,7 @@ require 'capybara'
 require 'playwright'
 
 require 'capybara/playwright/browser'
+require 'capybara/playwright/browser_runner'
 require 'capybara/playwright/browser_options'
 require 'capybara/playwright/dialog_event_handler'
 require 'capybara/playwright/driver'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capybara-playwright-driver
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - YusukeIwaki
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.6.2
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: allure-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -184,6 +184,7 @@ files:
 - lib/capybara/playwright.rb
 - lib/capybara/playwright/browser.rb
 - lib/capybara/playwright/browser_options.rb
+- lib/capybara/playwright/browser_runner.rb
 - lib/capybara/playwright/dialog_event_handler.rb
 - lib/capybara/playwright/driver.rb
 - lib/capybara/playwright/driver_extension.rb