frameworks-capybara 0.0.24 → 0.0.25

data/Rakefile

@@ -22,6 +22,7 @@ Jeweler::Tasks.new do |gem|
   # Include your dependencies below. Runtime dependencies are required when using your gem,
   # and development dependencies are only needed for development (ie running rake tasks, tests, etc)
   gem.add_runtime_dependency 'capybara', '>=0'
+  gem.add_runtime_dependency 'capybara-mechanize', '>=0'
   #  gem.add_development_dependency 'rspec', '> 1.2.3'
 end
 Jeweler::RubygemsDotOrgTasks.new

data/VERSION

@@ -1 +1 @@
-0.0.24
+0.0.25

data/frameworks-capybara.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{frameworks-capybara}
-  s.version = "0.0.24"
+  s.version = "0.0.25"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["mcrmfc"]
-  s.date = %q{2011-05-04}
+  s.date = %q{2011-05-06}
   s.description = %q{gem ti aid setup of Capybara for testing bbc sites}
   s.email = %q{mcrobbins@gmail.com}
   s.extra_rdoc_files = [
@@ -54,12 +54,14 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
       s.add_runtime_dependency(%q<capybara>, [">= 0"])
+      s.add_runtime_dependency(%q<capybara-mechanize>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
       s.add_dependency(%q<rcov>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
+      s.add_dependency(%q<capybara-mechanize>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
@@ -67,6 +69,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
     s.add_dependency(%q<rcov>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
+    s.add_dependency(%q<capybara-mechanize>, [">= 0"])
   end
 end
 

data/lib/frameworks/capybara.rb

@@ -1,3 +1,4 @@
+require 'capybara/cucumber'
 require 'monkey-patches/webdriver-patches'
 require 'monkey-patches/capybara-patches'
 require 'monkey-patches/send-keys'
@@ -28,9 +29,17 @@ class CapybaraSetup
     case capybara_opts[:browser] 
     when :headless then
       @driver = register_celerity_driver(capybara_opts)
+    when :mechanize then
+      @driver = register_mechanize_driver(capybara_opts)
     else
       @driver = register_selenium_driver(capybara_opts)
     end
+
+    Capybara.default_driver = @driver
+
+    if capybara_opts[:browser] == :mechanize and capybara_opts[:proxy]
+      Capybara.current_session.driver.agent.set_proxy(@proxy_host, 80)
+    end
   end
 
   private
@@ -73,12 +82,6 @@ class CapybaraSetup
           opts.delete :proxy
         end
 
-        #set proxy for remote browser (only supported for ff at present)
-        #if opts[:remote_browser_proxy_url]
-        #  opts[:proxy] = Selenium::WebDriver::Proxy.new(:http => opts[:remote_browser_proxy_url])
-        #  opts.delete :remote_browser_proxy_url
-        #end
-
         #TODO: temp workaround - needs refactoring
         cap_opts = opts.clone
         cap_opts.delete :profile
@@ -109,4 +112,15 @@ class CapybaraSetup
     end
     :celerity
   end
+
+  def register_mechanize_driver (opts)
+    require 'capybara/mechanize/cucumber' 
+    Capybara.register_driver :mechanize do |app|
+      opts.delete :browser #delete browser from options as value with  be 'headless'
+      Capybara.app_host = "http://www.int.bbc.co.uk"
+      Capybara::Driver::Mechanize.new(app)
+    end
+    :mechanize
+  end
+
 end

data/lib/frameworks/cucumber.rb

@@ -31,11 +31,7 @@ module Frameworks
   end #EnvHelper
 end #Frameworks
 
-if(!ENV['CAPYBARA_DISABLED'])
-  require 'capybara/cucumber'
-  #Set Capybara Driver - using capybara.rb 
-  Capybara.default_driver = CapybaraSetup.new.driver
-end
+CapybaraSetup.new unless ENV['CAPYBARA_DISABLED']
 
 #Add module into world to ensure visibility of instance variables within Cucumber
 World(Frameworks::EnvHelper)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 0
-  - 24
-  version: 0.0.24
+  - 25
+  version: 0.0.25
 platform: ruby
 authors: 
 - mcrmfc
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-04 00:00:00 +01:00
+date: 2011-05-06 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -92,6 +92,20 @@ dependencies:
   version_requirements: *id005
   name: capybara
   prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id006
+  name: capybara-mechanize
+  prerelease: false
 description: gem ti aid setup of Capybara for testing bbc sites
 email: mcrobbins@gmail.com
 executables: []