frameworks-capybara 2.0.0 → 2.0.1

data/CHANGES

@@ -1,3 +1,6 @@
+2.0.1
+Fixed issue with no_proxy variable not being honoured (Mechanize driver).
+
 2.0.0
 Upgraded to Capybara 2.0+ and the latest versions of remaining gems.
 Removed monkey patches, reclassifying some as "extensions".

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (2.0.0)
+    frameworks-capybara (2.0.1)
       capybara
       capybara-mechanize
       cucumber

data/lib/frameworks/cucumber.rb

@@ -109,6 +109,17 @@ module Frameworks
       agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
       agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/)[0][0].to_s,80) if http_proxy && !http_proxy.empty?
 
+      # The above proxy setting ignores any no_proxy variable setting:
+      # added the following to circumvent this
+      if(http_proxy)
+        no_proxy = ENV['NO_PROXY'] || ENV['no_proxy']
+        if(no_proxy)
+          # The no_proxy query string argument must not contain spaces
+          no_proxy_qs = no_proxy.gsub(/[, ]+/,',')
+          agent.agent.http.proxy = URI(http_proxy + '?no_proxy=' + no_proxy_qs)
+        end
+      end
+
       #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
       agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/spec/frameworks_cucumber_spec.rb

@@ -247,5 +247,33 @@ describe Frameworks::EnvHelper do
       agent.proxy_addr.should == 'mycache.co.uk'
     end
 
+   it "the proxy should be ignored if the no_proxy exclusion is set" do
+      proxy_host = 'mycache.co.uk'
+      proxy_port = '80'
+      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
+      no_proxy = 'ignore_this_host'
+      ENV['NO_PROXY'] = no_proxy
+      agent = new_mechanize(http_proxy=proxy_uri)
+      expect(agent).to be_a_kind_of Mechanize
+      expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
+      expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
+      no_proxy_array = [ no_proxy ]
+      expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
+    end
+
+    it "the proxy should be ignored if the no_proxy exclusion is set with multiple values" do
+      proxy_host = 'mycache.co.uk'
+      proxy_port = '80'
+      proxy_uri = 'http://'  + proxy_host + ':' + proxy_port
+      no_proxy1 = 'ignore_this_host'
+      no_proxy2 = '.and.this.domain'
+      ENV['NO_PROXY'] = no_proxy1 + ', ' + no_proxy2
+      agent = new_mechanize(http_proxy=proxy_uri)
+      expect(agent).to be_a_kind_of Mechanize
+      expect(agent.agent.http.proxy_uri.host).to eq(proxy_host)
+      expect(agent.agent.http.proxy_uri.port).to eq(proxy_port.to_i)
+      no_proxy_array = [ no_proxy1, no_proxy2 ]
+      expect(agent.agent.http.no_proxy).to eq(no_proxy_array)
+    end
   end
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: frameworks-capybara
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
+  prerelease: 
 platform: ruby
 authors:
 - matt robbins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-07 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mechanize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara-mechanize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: w3c_validators
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -125,6 +142,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -132,6 +150,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -169,26 +188,33 @@ files:
 - spec/unit_test_monkeypatches.rb
 homepage: 
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3489083016485421328
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 3489083016485421328
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Gem to ease the pain of managing capybara driver config and provide a home
   for common utils and patches
 test_files: []

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MTA2NDkzZDc2NDc1ZmJiMmI0MGY2ODJiMGNmODA0NjI0Y2ZhYWQxYQ==
-  data.tar.gz: !binary |-
-    YTY4OGNkMjA2OGVhNjNiMmJjYjY0M2E5YTYwNGYwMzkwMzUyOGY2Mw==
-SHA512:
-  metadata.gz: !binary |-
-    ZjdmMjFmMGNkZjBlMDQwYjI3OTY2ZWQ4M2NiNWMzNmJmODE4ZTQ4MjhhZDU1
-    NTllNTAxMzZiNWY2NWRhYjFhZmQyZjQ0NTcxNmIxZWY3NDNiMzVhNWM2NWU2
-    M2NlODZhNWYzYjI2MTMzNGY2MWUwMTA5MTg5ZTY2NTUwNGYwZGM=
-  data.tar.gz: !binary |-
-    NWRhYmZlN2VhMDg4YWM0NTc3MTViNGEzMjY5ODA3YTEwMzMxMTkxOTkwOGY2
-    NzdlZTQzYjIwMzNjN2I5ZmNmMWI3MGU4NDQ0NDBhYWY1MzgzZDY3MTMyYWRh
-    ZmRkMWFjNTg1ZTgxNDI2YmZhNmViYzI2MWJkZDIxMzhjZGRiN2U=