frameworks-capybara 0.2.15 → 0.2.16

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    frameworks-capybara (0.2.15)
+    frameworks-capybara (0.2.16)
       capybara (>= 1.0.0)
       capybara-celerity
       capybara-mechanize (>= 0.3.0)
@@ -28,9 +28,6 @@ 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)
@@ -95,7 +92,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara-webkit
   frameworks-capybara!
   jruby-openssl
   rake

data/frameworks-capybara.gemspec

@@ -27,7 +27,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("capybara-celerity")
   s.add_runtime_dependency("w3c_validators")
   s.add_runtime_dependency("cucumber", [">= 0.10.5"])
-  s.add_development_dependency("capybara-webkit")
   s.add_development_dependency("rake")
   s.add_development_dependency("rspec", [">=1.0.0"])
 end

data/lib/frameworks/capybara.rb

@@ -8,7 +8,6 @@ require 'monkey-patches/net-http-persistent-patches'
 require 'selenium-webdriver'
 require 'capybara/mechanize/cucumber' 
 require 'capybara/celerity'
-require 'capybara-webkit'
 
 class CapybaraSetup
 
@@ -54,8 +53,6 @@ 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
@@ -165,12 +162,6 @@ 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|

data/lib/frameworks/cucumber.rb

@@ -3,7 +3,7 @@ require 'w3c_validators'
 require 'monkey-patches/cucumber-patches'
 
 #This is hackish but means we only run once in cucumber and not every scenario
-if(ENV['XVFB']=='true' || ENV['BROWSER'] == 'webkit')
+if(ENV['XVFB']=='true')
   puts "You have chosen to use XVFB - ensure you have yum installed Xvfb Xorg and firefox"
   require 'headless'
   headless = Headless.new
@@ -117,11 +117,6 @@ Before do
     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.15'
+  VERSION = '0.2.16'
 end

data/spec/frameworks_capybara_spec.rb

@@ -450,20 +450,7 @@ describe CapybaraSetup do
 
       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: 9
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 2
-  - 15
-  version: 0.2.15
+  - 16
+  version: 0.2.16
 platform: ruby
 authors: 
 - matt robbins
@@ -133,26 +133,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: capybara-webkit
+  name: rake
   version_requirements: *id008
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   requirement: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
-  version_requirements: *id009
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  type: :development
-  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -164,7 +150,7 @@ dependencies:
         - 0
         version: 1.0.0
   name: rspec
-  version_requirements: *id010
+  version_requirements: *id009
   prerelease: false
 description: Gem to ease the pain of managing capybara driver config and provide a home for common utils and patches
 email: