capybara-webmock 0.5.5 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 450b7bf5f02a330c0b16a782ea81808fe8377a6a338762b37aa035054316b4c2
-  data.tar.gz: a8c2c65daee214cf9911d9fc1fdc9e39ad9e40d47b3b37df48c03ccd3505e5a2
+  metadata.gz: b8379a3e56d9f89962f14ef02f2a9036666731a82bbcd0d39d2bdd12bad6e435
+  data.tar.gz: 31d3cc80d646135ee11f7397292392d63073a1bbbd378e5269321c0a18f665a9
 SHA512:
-  metadata.gz: 89aceae8564772edfc9c64ee4c88a25e7c0f747acd970fcad61f6f155c6332baf5d0f757440284ef5ab4a5ea32a9e5dfb92c9809be63a6291234960c1c4eb37c
-  data.tar.gz: dc9ce238ba25cd475cd2eeb900f483bdfb6bc3b0763131c90326534d79133282ec5d98d7259e5599c5e1949e82feae989c26a1aaa7d897dbe8884cc4f1c32e6f
+  metadata.gz: 927cc95692c0efec180d264d1c126408b1c454032ebdc8f5f0ed3c39ec60abf89348f9634310901f71bcb8dd75d8bdd2b49707b24eee27639ed5b17ebaa721f3
+  data.tar.gz: 927611b5c8b24e84a9031feb7fe5102ea0d07f15e551215d994a1c65865ca4d35b6f6acf9b09495de13e2fbb10238f9db2605d8cbf0cf500b8b76f7f6335b202

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.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

@@ -110,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

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/hashrocket/capybara-webmock'
   spec.license       = 'MIT'
 
-  spec.required_ruby_version     = ">= 2.0.0"
+  spec.required_ruby_version     = ">= 2.6.0"
 
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -25,7 +25,9 @@ Gem::Specification.new do |spec|
   spec.add_dependency "capybara", ">= 2.4", "< 4"
   spec.add_dependency "rack", ">= 1.4"
   spec.add_dependency "rack-proxy", ">= 0.6.0"
-  spec.add_dependency "selenium-webdriver", "~> 3.0"
+  spec.add_dependency "selenium-webdriver", ">= 4.0"
+  spec.add_dependency "rexml", ">= 3.2"
+  spec.add_dependency "webrick", ">= 1.7"
 
   spec.add_development_dependency "bundler", ">= 1.13"
   spec.add_development_dependency "pry", "~> 0.10.4"

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/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.5'.freeze
+    VERSION = '0.7.0'.freeze
   end
 end

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]
@@ -117,7 +123,7 @@ module Capybara
       end
 
       def kill_old_process
-        return unless File.exists?(pid_file)
+        return unless File.exist?(pid_file)
         old_pid = File.read(pid_file).to_i
         kill_process(old_pid) if old_pid > 1
         remove_pid_file
@@ -146,13 +152,13 @@ module Capybara
       end
 
       def write_pid_file
-        raise "Pid file #{pid_file} already exists" if File.exists?(pid_file)
+        raise "Pid file #{pid_file} already exists" if File.exist?(pid_file)
         FileUtils.mkdir_p(File.dirname(pid_file))
         File.write(pid_file, @pid.to_s)
       end
 
       def remove_pid_file
-        File.delete(pid_file) if File.exists?(pid_file)
+        File.delete(pid_file) if File.exist?(pid_file)
       end
     end
   end
@@ -168,11 +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, options: Capybara::Webmock.chrome_options)
+  Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: [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)
+  Capybara::Selenium::Driver.new(app, browser: :chrome, capabilities: [Capybara::Webmock.chrome_headless_options])
 end
 
 Capybara.register_driver :capybara_webmock_poltergeist do |app|

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webmock
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.7.0
 platform: ruby
 authors:
 - Jake Worth
 - Dillon Hafer
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-10-08 00:00:00.000000000 Z
+date: 2023-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -63,16 +63,44 @@ dependencies:
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.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
@@ -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
@@ -206,15 +234,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.4.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-browsers
-    steps:
-      - checkout
-      - run: bundle install
-      - run: rake