capybara-webmock 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: db388c98471efbe6d26acf80ee96b4804e310b59
-  data.tar.gz: 4bdc44c1f858fd1ae57784db6fa92966420269a4
+SHA256:
+  metadata.gz: 28f4ebed6063f94e18d058d63223bd1c9fd437241e622cee85f38597122aca2b
+  data.tar.gz: debbbb2e0c9d47f31930781dc38e19b0dbd4bea58424b3325a25dd8d119c3e48
 SHA512:
-  metadata.gz: fc39f134851122d660ba26701d6c46a4bf958951dbbfde066119755ce6be750113d539883b917e5e00bde876ed952bb4604daa026b0e2371e0de67b5a35399be
-  data.tar.gz: 8cdaf05aa300e8b91a13ba7b6033a1a09ad087a90adf22d23364bed93870e9aea4c751b4488e2032cb78ba01d59af374a4db90e7f97c175e1353a56b1e933b93
+  metadata.gz: 6f2a033ab751fd97ff1b8798ab87264625191a361619f6b70d9ef6e7323dd739cc0ca95401de958d821cd1511b7aa996060d7713ad7e7eb0f01d60b6e25f4dbb
+  data.tar.gz: f6e373337fee16aef5c716c9648103651905ca1e3996e67051f183b8f1c686de903be936b8dc5f627490ff935162bbd7efac0601b7df156ad1de4c01acc2d2e3

data/.github/workflows/run-tests.yml

@@ -0,0 +1,25 @@
+name: Run tests
+
+on: [push]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
+        ruby: [2.5, 2.6, 2.7, '3.0', head]
+    runs-on: ${{ matrix.os }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: nanasess/setup-chromedriver@master
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - run: |
+        export DISPLAY=":99"
+        chromedriver --url-base=/wd/hub &
+        sudo Xvfb -ac :99 -screen 0 1280x1024x24 > /dev/null 2>&1 &
+        bundle exec rake

data/README.md

@@ -81,6 +81,8 @@ or:
 ```ruby
 # Use Chrome Driver
 Capybara.javascript_driver = :capybara_webmock_chrome
+# or Chrome Driver in headless mode
+Capybara.javascript_driver = :capybara_webmock_chrome_headless
 ```
 
 ```ruby
@@ -88,7 +90,7 @@ Capybara.javascript_driver = :capybara_webmock_chrome
 Capybara.javascript_driver = :capybara_webmock_poltergeist
 ```
 
-*NOTE: These are just two default driver wrappers this gem provides. If you are
+*NOTE: These are just some default driver wrappers this gem provides. If you are
 already using a custom driver profile you can still use `capybara-webmock`, you
 just need to configure proxy settings to `127.0.0.1:9292`*
 
@@ -108,6 +110,13 @@ it 'makes a request to /somewhere when the user visits the page' do
 end
 ```
 
+You can provide extra hosts to be permitted past the proxy, but should be used carefully.
+This setting does not remove the default localhosts, but adds to them.
+
+```ruby
+Capybara::Webmock.allowed_hosts = ["example.com", "sub.example.com"]
+```
+
 ### Development
 
 After pulling down the repo, install dependencies:

data/capybara-webmock.gemspec

@@ -26,8 +26,10 @@ Gem::Specification.new do |spec|
   spec.add_dependency "rack", ">= 1.4"
   spec.add_dependency "rack-proxy", ">= 0.6.0"
   spec.add_dependency "selenium-webdriver", "~> 3.0"
+  spec.add_dependency "rexml", ">= 3.2"
+  spec.add_dependency "webrick", ">= 1.7"
 
-  spec.add_development_dependency "bundler", "~> 1.13"
+  spec.add_development_dependency "bundler", ">= 1.13"
   spec.add_development_dependency "pry", "~> 0.10.4"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"

data/lib/capybara/webmock.rb

@@ -9,15 +9,21 @@ require 'capybara/webmock/proxied_request'
 
 module Capybara
   module Webmock
+    SEPARATOR = "|"
+
     class << self
-      attr_accessor :port_number, :pid_file, :kill_timeout, :start_timeout
+      attr_accessor :port_number, :pid_file, :kill_timeout, :start_timeout, :allowed_hosts
 
       def start
         if @pid.nil?
           kill_old_process
           gem_path   = File.dirname(__FILE__)
           proxy_file = File.join(gem_path, 'webmock', 'config.ru')
-          stdin, stdout, wait_thr = Open3.popen2e({ "PROXY_PORT_NUMBER" => port_number.to_s }, "rackup", proxy_file)
+          env_config = {
+            "CAPYBARA_WEBMOCK_PROXY_PORT_NUMBER" => port_number.to_s,
+            "CAPYBARA_WEBMOCK_ADDED_HOSTS" => allowed_hosts.to_a.join(SEPARATOR)
+          }
+          stdin, stdout, wait_thr = Open3.popen2e(env_config, "rackup", proxy_file)
           stdin.close
           @stdout = stdout
           @pid = wait_thr[:pid]
@@ -68,7 +74,13 @@ module Capybara
       end
 
       def chrome_options
-        {args: [ "--proxy-server=127.0.0.1:#{port_number}" ]}
+        ::Selenium::WebDriver::Chrome::Options.new.tap do |options|
+          options.add_argument "--proxy-server=127.0.0.1:#{port_number}"
+        end
+      end
+
+      def chrome_headless_options
+        chrome_options.tap { |options| options.headless! }
       end
 
       def phantomjs_options
@@ -162,9 +174,11 @@ Capybara.register_driver :capybara_webmock do |app|
 end
 
 Capybara.register_driver :capybara_webmock_chrome do |app|
-  Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: {
-    chromeOptions: Capybara::Webmock.chrome_options
-  })
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: Capybara::Webmock.chrome_options)
+end
+
+Capybara.register_driver :capybara_webmock_chrome_headless do |app|
+  Capybara::Selenium::Driver.new(app, browser: :chrome, options: Capybara::Webmock.chrome_headless_options)
 end
 
 Capybara.register_driver :capybara_webmock_poltergeist do |app|

data/lib/capybara/webmock/config.ru

@@ -2,4 +2,4 @@ require 'rack'
 require 'capybara/webmock/proxy'
 
 app = Capybara::Webmock::Proxy.new(Process.pid)
-Rack::Handler::WEBrick.run(app, Port: ENV.fetch('PROXY_PORT_NUMBER', 9292))
+Rack::Handler::WEBrick.run(app, Port: ENV.fetch('CAPYBARA_WEBMOCK_PROXY_PORT_NUMBER', 9292))

data/lib/capybara/webmock/proxied_request.rb

@@ -1,25 +1,19 @@
+require 'forwardable'
 require 'uri'
 
 module Capybara
   module Webmock
     class ProxiedRequest
+      extend Forwardable
+
       attr_reader :referrer, :uri
 
+      def_delegators :uri, :fragment, :host, :hostname, :password, :path, :port, :query, :scheme, :user, :userinfo
+
       def initialize(raw_referrer, raw_uri)
         @referrer = raw_referrer == "-" ? nil : URI.parse(raw_referrer)
         @uri = URI.parse(raw_uri)
       end
-
-      def fragment; @uri.fragment; end
-      def host; @uri.host; end
-      def hostname; @uri.hostname; end
-      def password; @uri.password; end
-      def path; @uri.path; end
-      def port; @uri.port; end
-      def query; @uri.query; end
-      def scheme; @uri.scheme; end
-      def user; @uri.user; end
-      def userinfo; @uri.userinfo; end
     end
   end
 end

data/lib/capybara/webmock/proxy.rb

@@ -2,7 +2,7 @@ require 'rack/proxy'
 require 'capybara/webmock'
 
 class Capybara::Webmock::Proxy < Rack::Proxy
-  ALLOWED_HOSTS = allowed_hosts = ['127.0.0.1', 'localhost', /(.*\.|\A)lvh.me/]
+  DEFAULT_ALLOWED_HOSTS = ['127.0.0.1', 'localhost', /(.*\.|\A)lvh.me/]
 
   def call(env)
     @streaming = true
@@ -27,8 +27,12 @@ class Capybara::Webmock::Proxy < Rack::Proxy
 
   private
 
+  def allowed_hosts
+    DEFAULT_ALLOWED_HOSTS + ENV.fetch('CAPYBARA_WEBMOCK_ADDED_HOSTS', "").split(Capybara::Webmock::SEPARATOR)
+  end
+
   def allowed_host?(host)
-    ALLOWED_HOSTS.any? do |allowed_host|
+    allowed_hosts.any? do |allowed_host|
       case allowed_host
       when Regexp
         allowed_host =~ host

data/lib/capybara/webmock/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Webmock
-    VERSION = '0.5.1'.freeze
+    VERSION = '0.6.0'.freeze
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webmock
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Jake Worth
 - Dillon Hafer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-09-12 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -73,18 +73,46 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rexml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: webrick
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.13'
 - !ruby/object:Gem::Dependency
@@ -178,7 +206,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
+- ".github/workflows/run-tests.yml"
 - ".gitignore"
 - ".rspec"
 - CODE_OF_CONDUCT.md
@@ -198,7 +226,7 @@ homepage: https://github.com/hashrocket/capybara-webmock
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -213,9 +241,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.12
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Mock external requests
 test_files: []

data/.circleci/config.yml

@@ -1,9 +0,0 @@
-version: 2
-jobs:
-  build:
-    docker:
-      - image: circleci/ruby:2.5.1
-    steps:
-      - checkout
-      - run: bundle install
-      - run: rake