capybara-webmock 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2c1c6bf43bd5b107c8f060e58c1fd108ae59b4b
-  data.tar.gz: 8af76108b2d5287647ce73cb892387e6e519df7d
+  metadata.gz: 1c8941163a39745ce0f31270cde7858c787e00c1
+  data.tar.gz: fb8c98139687e3ccd5ecd7beedb46fe92e57663d
 SHA512:
-  metadata.gz: 6925ef8010bb52e315b31d49ab067ac3af88b8830d10b7e46dc9d6299b0f3c29626cdef92a9b26e76d7cdf9964570b01a6d5870a7f0bbaf51a53d7aeea7f4906
-  data.tar.gz: a6351773d12fd974572d514ab851bb6895161c7bacd5ae0c318613085418e416b6f2fe05627fe5767ce5aaa9554a7e6a9cc21c5c35655dca0d439a8de824f7e4
+  metadata.gz: 0379818df23512a9e8856657b5da11b01eb7c233c31d9f3f5f22f8b3e4aa74ba82af01d09fa2d9ccd3ae78e82450fd8bcd919fe7211e9a7d1290258fd5a25412
+  data.tar.gz: b9508aab67d153d8702b58984005130a9890f56361906e96f1f7b30cc54d1fa781bcaddefe16beab82817f88d28faf293e32661e5bc24a457f6a8b977ee843d4

data/.rspec

@@ -1,2 +1,3 @@
 --format documentation
 --color
+--order rand

data/README.md

@@ -1,8 +1,10 @@
-[![CircleCI](https://circleci.com/gh/hashrocket/capybara-webmock.svg?style=svg)](https://circleci.com/gh/hashrocket/capybara-webmock)
+[![CircleCI](https://img.shields.io/circleci/project/hashrocket/capybara-webmock/master.svg?maxAge=2592000)](https://circleci.com/gh/hashrocket/capybara-webmock)
 [![Version](https://img.shields.io/gem/v/capybara-webmock.svg?style=flat)](https://rubygems.org/gems/capybara-webmock)
 
 # Capybara::Webmock
 
+> Mock external requests for Capybara JavaScript drivers.
+
 Browser integration tests are expensive. We can mock external requests in our
 tests, but once a browser is involved, we lose control.
 
@@ -12,14 +14,14 @@ integration test suite to a crawl.
 `Capybara::Webmock` is a Rack proxy server that sits between your Ruby on Rails
 Selenium test suite and the Internet, blocking external requests.
 
-Adding this gem to your project can significantly speed up the test suite. No
-more waiting on irrelevant external requests.
+Use of this gem can significantly speed up the test suite. No more waiting on
+irrelevant external requests.
 
-`localhost`, `127.0.0.1`, `*.lvh.me`, and `lvh.me` are the only whitelisted domains. Custom domain
-support is a planned feature.
+`localhost`, `127.0.0.1`, `*.lvh.me`, and `lvh.me` are the only whitelisted
+domains. Custom domain support is a planned feature.
 
-This gem currently supports Ruby on Rails applications with RSpec and
-Cucumber test suites, using the Selenium Firefox and Chrome drivers.
+This gem currently supports Ruby on Rails applications
+using the Selenium Firefox and Chrome drivers.
 
 ### Installation
 
@@ -52,6 +54,8 @@ require 'capybara/webmock'
 Then in your RSpec configuration:
 
 ```ruby
+# spec/spec_helper.rb
+
 RSpec.configure do |config|
   config.before(:suite) do
     Capybara::Webmock.start
@@ -66,6 +70,8 @@ end
 Or, your Cucumber configuration:
 
 ```ruby
+# features/support/env.rb
+
 Capybara::Webmock.start
 
 at_exit do
@@ -80,14 +86,23 @@ Then use the `capybara_webmock` JavaScript driver:
 Capybara.javascript_driver = :capybara_webmock
 ```
 
-or
+or:
 
 ```ruby
 # Use Chrome Driver
 Capybara.javascript_driver = :capybara_webmock_chrome
 ```
 
-By default the proxy server run on port `9292`, but this can be customized
+```ruby
+# Use Poltergeist Driver
+Capybara.javascript_driver = :capybara_webmock_poltergeist
+```
+
+*NOTE: These are just two 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`*
+
+By default the proxy server runs on port `9292`, but this can be customized
 with the following configuration:
 
 ```ruby

data/bin/setup

@@ -4,5 +4,3 @@ IFS=$'\n\t'
 set -vx
 
 bundle install
-
-# Do any other automated setup that you need to do here

data/capybara-webmock.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |spec|
   spec.email         = ['dev@hashrocket.com']
 
   spec.summary       = %q{Mock external requests}
-  spec.description   = %q{Mock external requests for Capybara Firefox drivers}
+  spec.description   = %q{Mock external requests for Capybara JavaScript drivers}
   spec.homepage      = 'https://github.com/hashrocket/capybara-webmock'
   spec.license       = 'MIT'
 
@@ -24,8 +24,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "capybara", "~> 2.4"
   spec.add_dependency "rack", ">= 1.4"
-  spec.add_dependency "rack-proxy", "0.6.0"
-  spec.add_dependency "selenium-webdriver", "~> 2.0"
+  spec.add_dependency "rack-proxy", ">= 0.6.0"
+  spec.add_dependency "selenium-webdriver", "~> 3.0"
 
   spec.add_development_dependency "bundler", "~> 1.13"
   spec.add_development_dependency "pry", "~> 0.10.4"

data/lib/capybara/webmock.rb

@@ -17,7 +17,7 @@ module Capybara
       end
 
       def stop
-        if File.exists?(Capybara::Webmock::Proxy::PID_FILE)
+        if File.exist?(Capybara::Webmock::Proxy::PID_FILE)
           rack_pid = File.read(Capybara::Webmock::Proxy::PID_FILE).to_i
           Process.kill('HUP', rack_pid)
         end
@@ -38,6 +38,9 @@ module Capybara
         ["--proxy-server=127.0.0.1:#{port_number}"]
       end
 
+      def phantomjs_options
+        ["--proxy=127.0.0.1:#{port_number}"]
+      end
     end
   end
 end
@@ -51,3 +54,7 @@ end
 Capybara.register_driver :capybara_webmock_chrome do |app|
   Capybara::Selenium::Driver.new(app, browser: :chrome, switches: Capybara::Webmock.chrome_switches)
 end
+
+Capybara.register_driver :capybara_webmock_poltergeist do |app|
+  Capybara::Poltergeist::Driver.new(app, phantomjs_options: Capybara::Webmock.phantomjs_options)
+end

data/lib/capybara/webmock/proxy.rb

@@ -6,6 +6,7 @@ class Capybara::Webmock::Proxy < Rack::Proxy
 
   def initialize(pid)
     write_pid(pid)
+    ensure_log_exists
   end
 
   def perform_request(env)
@@ -20,7 +21,7 @@ class Capybara::Webmock::Proxy < Rack::Proxy
   end
 
   def self.remove_pid
-    File.delete(PID_FILE) if File.exists?(PID_FILE)
+    File.delete(PID_FILE) if File.exist?(PID_FILE)
   end
 
   private
@@ -43,4 +44,10 @@ class Capybara::Webmock::Proxy < Rack::Proxy
     Dir.mkdir(pid_dir) unless Dir.exist?(pid_dir)
     File.write(PID_FILE, pid)
   end
+
+  def ensure_log_exists
+    log_file = File.join('log', 'test.log')
+    Dir.mkdir('log') unless Dir.exist?('log')
+    File.open(log_file, 'a') { |f| f.write "" }
+  end
 end

data/lib/capybara/webmock/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Webmock
-    VERSION = "0.3.0"
+    VERSION = "0.4.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webmock
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jake Worth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-09 00:00:00.000000000 Z
+date: 2017-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -43,14 +43,14 @@ dependencies:
   name: rack-proxy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.6.0
 - !ruby/object:Gem::Dependency
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Mock external requests for Capybara Firefox drivers
+description: Mock external requests for Capybara JavaScript drivers
 email:
 - dev@hashrocket.com
 executables: []