frameworks-capybara 0.2.13 → 0.2.14

data/Gemfile.lock

@@ -1,11 +1,13 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.13)
+    frameworks-capybara (0.2.14)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)
+      capybara-webkit
       cucumber (>= 0.10.5)
+      headless
       json
       w3c_validators
 
@@ -27,6 +29,9 @@ GEM
     capybara-mechanize (0.3.0)
       capybara (~> 1.1)
       mechanize (~> 2.3)
+    capybara-webkit (0.12.1)
+      capybara (>= 1.0.0, < 1.2)
+      json
     celerity (0.9.2)
     childprocess (0.3.3)
       ffi (~> 1.0.6)
@@ -41,6 +46,7 @@ GEM
     ffi (1.0.11)
     gherkin (2.11.1)
       json (>= 1.4.6)
+    headless (0.3.1)
     json (1.7.3)
     libwebsocket (0.1.4)
       addressable

data/frameworks-capybara.gemspec

@@ -22,7 +22,9 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency("capybara", [">=1.0.0"])
   s.add_runtime_dependency("capybara-mechanize", [">=0.3.0"])
+  s.add_runtime_dependency("capybara-webkit")
   s.add_runtime_dependency("json")
+  s.add_runtime_dependency("headless")
   s.add_runtime_dependency("capybara-celerity")
   s.add_runtime_dependency("w3c_validators")
   s.add_runtime_dependency("cucumber", [">= 0.10.5"])

data/lib/frameworks/capybara.rb

@@ -8,6 +8,7 @@ require 'monkey-patches/net-http-persistent-patches'
 require 'selenium-webdriver'
 require 'capybara/mechanize/cucumber' 
 require 'capybara/celerity'
+require 'capybara-webkit'
 
 class CapybaraSetup
 
@@ -53,6 +54,8 @@ class CapybaraSetup
       @driver = register_celerity_driver(capybara_opts)
     when :mechanize then
       @driver = register_mechanize_driver(capybara_opts)
+    when :webkit then
+      @driver = register_webkit_driver(capybara_opts)
     else
       @driver = register_selenium_driver(capybara_opts, selenium_remote_opts, custom_opts)
     end
@@ -162,6 +165,13 @@ class CapybaraSetup
     :mechanize
   end
 
+  def register_webkit_driver(opts)
+    Capybara.register_driver :webkit do |app|
+      Capybara::Driver::Webkit.new(app)
+    end
+    :webkit
+  end
+
   def clean_opts(opts, *args)
     args.each do |arg|
       opts.delete arg

data/lib/frameworks/cucumber.rb

@@ -2,7 +2,8 @@ require 'frameworks/capybara'
 require 'w3c_validators'
 require 'monkey-patches/cucumber-patches'
 
-if(ENV['XVFB']=='true')
+#This is hackish but means we only run once in cucumber and not every scenario
+if(ENV['XVFB']=='true' || ENV['BROWSER'] == 'webkit')
   puts "You have chosen to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
   require 'headless'
   headless = Headless.new
@@ -110,13 +111,17 @@ Before do
 
     page.driver.browser.agent.ca_file = ENV['CA_CERT_LOCATION'] if ENV['CA_CERT_LOCATION']
 
-    #TODO: Fix proxy logic globally...use system proxy instead of PROXY_URL
     page.driver.browser.agent.set_proxy(http_proxy.scan(/http:\/\/(.*):80/).to_s,80) if http_proxy
 
     #This is necessary because Mech2 does not ship with root certs like Mech1 did and boxes may not have the OpenSSL set installed
     page.driver.browser.agent.verify_mode = OpenSSL::SSL::VERIFY_NONE
   end
 
+  #TODO: See if this can be set at the driver level rather than in before do - and only want to start headless once
+  if page.driver.class == Capybara::Driver::Webkit
+    page.driver.browser.set_proxy(:host => http_proxy.scan(/http:\/\/(.*):80/).to_s,:port => '80') if http_proxy
+  end
+
   generate_base_urls
 end
 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module FrameworksCapybara
-  VERSION = '0.2.13'
+  VERSION = '0.2.14'
 end

data/spec/frameworks_capybara_spec.rb

@@ -275,7 +275,7 @@ describe CapybaraSetup do
         end
         it_behaves_like "Selenium Driver Options Array"
       end
-      
+
 
       context "with Selenium driver and additional firefox preferences" do
         before do
@@ -294,7 +294,7 @@ describe CapybaraSetup do
         end
         it_behaves_like "Selenium Driver Options Array"
       end
-      
+
 
       context "with Selenium driver and new profile and custom prefs" do
         before do
@@ -312,7 +312,7 @@ describe CapybaraSetup do
         end
         it_behaves_like "Selenium Driver Options Array"
       end
-      
+
       context "with Remote Selenium driver and specified Chrome Switches" do
         before do
           ENV['BROWSER'] = 'remote'
@@ -449,6 +449,21 @@ describe CapybaraSetup do
         end
 
       end
+
+      describe "should allow Webkit driver to be created" do
+        context "with minimal Webkit driver" do
+          before do
+            ENV['BROWSER'] = 'webkit'
+          end
+
+          it "should be initialized correctly" do 
+            Capybara.delete_session
+            CapybaraSetup.new.driver.should == :webkit
+            Capybara.current_session.driver.should be_a_kind_of Capybara::Driver::Webkit
+          end
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: frameworks-capybara
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 0
   - 2
-  - 13
-  version: 0.2.13
+  - 14
+  version: 0.2.14
 platform: ruby
 authors: 
 - matt robbins
@@ -61,7 +61,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
+  name: capybara-webkit
   version_requirements: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -75,7 +75,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: capybara-celerity
+  name: json
   version_requirements: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
@@ -89,12 +89,40 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: w3c_validators
+  name: headless
   version_requirements: *id005
   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"
+  name: capybara-celerity
+  version_requirements: *id006
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  name: w3c_validators
+  version_requirements: *id007
+  prerelease: false
+- !ruby/object:Gem::Dependency 
+  type: :runtime
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,11 +134,11 @@ dependencies:
         - 5
         version: 0.10.5
   name: cucumber
-  version_requirements: *id006
+  version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,11 +148,11 @@ dependencies:
         - 0
         version: "0"
   name: rake
-  version_requirements: *id007
+  version_requirements: *id009
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -136,7 +164,7 @@ dependencies:
         - 0
         version: 1.0.0
   name: rspec
-  version_requirements: *id008
+  version_requirements: *id010
   prerelease: false
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: