bbc-capybara-mechanize 0.3.0.rc0 → 0.3.1

data/lib/capybara/mechanize/browser.rb

@@ -10,7 +10,21 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
   def initialize(app, options)
     @agent = ::Mechanize.new
     @agent.redirect_ok = false
-
+    if !options.empty?
+      if options[:proxy] && !options[:proxy].empty?
+        proxy = nil
+        begin
+          proxy = URI.parse(options[:proxy])
+        rescue URI::InvalidURIError => e
+          raise "You have entered an invalid proxy address #{options[:proxy]}. Check proxy settings."
+        end
+        if proxy && proxy.instance_of?(URI::HTTP) 
+          @agent.set_proxy(proxy.host, proxy.port)
+        else
+          raise "ProxyError: You have entered an invalid proxy address #{options[:proxy]}. e.g. (http|https)://proxy.com(:port)"
+        end
+      end
+    end
     super
   end
   
@@ -163,7 +177,7 @@ class Capybara::Mechanize::Browser < Capybara::RackTest::Browser
       if remote_uri.host.nil?
         remote_host = @last_remote_host || Capybara.app_host || Capybara.default_host
         url = File.join(remote_host, url)
-        url = "http://#{url}" unless url.include?("http")
+        url = "http://#{url}" unless url =~ /^http:/ or url =~ /^https:/
       else
         @last_remote_host = "#{remote_uri.host}:#{remote_uri.port}"
       end

data/lib/capybara/mechanize/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Mechanize
-    VERSION = '0.3.0.rc0'
+    VERSION = '0.3.1'
   end
 end

data/spec/driver/remote_mechanize_driver_spec.rb

@@ -56,3 +56,40 @@ describe Capybara::Mechanize::Driver do
   end
   
 end
+
+describe "Capybara::Mechanize::Driver, browser" do
+  
+  before(:each) do
+    Capybara.app_host = REMOTE_TEST_URL
+  end
+
+  after(:each) do
+    Capybara.app_host = nil
+  end
+  
+  context "in remote mode" do
+    it "should not throw an error when empty option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {})
+      end.should_not raise_error()
+    end
+
+    it "should throw an error when bad proxy option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => BAD_PROXY}).browser
+      end.should raise_error("ProxyError: You have entered an invalid proxy address #{BAD_PROXY}. e.g. (http|https)://proxy.com(:port)")
+    end
+
+    it "should not throw an error when good proxy option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => GOOD_PROXY}).browser
+      end.should_not raise_error()
+    end
+
+    it "should not throw an error when good proxy with port option is passed" do
+      running do
+        Capybara::Mechanize::Driver.new(ExtendedTestApp, {:proxy => PROXY_WITH_PORT}).browser
+      end.should_not raise_error()
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -32,3 +32,6 @@ RSpec.configure do |config|
 end
 
 REMOTE_TEST_URL = "http://localhost"
+GOOD_PROXY = "http://proxy.com"
+BAD_PROXY = "fasfasfasfasf"
+PROXY_WITH_PORT = "http://proxy.com:520"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bbc-capybara-mechanize
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  hash: 17
+  prerelease: 
   segments: 
   - 0
   - 3
-  - 0
-  - rc0
-  version: 0.3.0.rc0
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Jeroen van Dijk
@@ -16,39 +16,40 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 +01:00
-default_executable: 
+date: 2012-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: mechanize
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: capybara
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  name: mechanize
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
         version: 1.0.0
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  name: capybara
 description: RackTest driver for Capybara, but with remote request support thanks to mechanize
 email: jeroen@jeevidee.nl
 executables: []
@@ -70,7 +71,6 @@ files:
 - spec/session/remote_mechanize_spec.rb
 - spec/spec_helper.rb
 - README.mdown
-has_rdoc: true
 homepage: https://github.com/mobzilla/capybara-mechanize
 licenses: []
 
@@ -84,6 +84,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -92,13 +93,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: RackTest driver for Capybara with remote request support