[DRE-commits] [ruby-capybara] 06/08: d/patches: Refresh patches against new upstream

[Sebastien Badia]

This is an automated email from the git hooks/post-receive script.

sbadia-guest pushed a commit to branch master
in repository ruby-capybara.

commit 4746460ca0a111cf44a2278bad615576664f33a6
Author: Sebastien Badia <seb at sebian.fr>
Date:   Sun Apr 27 21:26:39 2014 +0200

    d/patches: Refresh patches against new upstream
---
 ...01-Remove-support-for-the-selenium-driver.patch |  4 +--
 ...002-Inhibit-tests-for-the-selenium-driver.patch | 15 ++++++-----
 ...Remove-uneeded-dependency-on-pry-in-tests.patch | 29 ----------------------
 3 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/debian/patches/0001-Remove-support-for-the-selenium-driver.patch b/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
index 5087207..a612708 100644
--- a/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
+++ b/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
@@ -8,11 +8,9 @@ Until ruby-selenium-webdriver lands in Debian, see
  lib/capybara.rb |    4 ----
  1 file changed, 4 deletions(-)
 
-diff --git a/lib/capybara.rb b/lib/capybara.rb
-index 5ec55ce..cb47a63 100644
 --- a/lib/capybara.rb
 +++ b/lib/capybara.rb
-@@ -338,7 +338,3 @@ end
+@@ -361,7 +361,3 @@ end
  Capybara.register_driver :rack_test do |app|
    Capybara::RackTest::Driver.new(app)
  end
diff --git a/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch b/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
index 7b4defb..fe5b181 100644
--- a/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
+++ b/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
@@ -8,18 +8,17 @@ Debian (see #703492), so let's just skip its tests.
  spec/selenium_spec.rb |    5 +++++
  1 file changed, 5 insertions(+)
 
-diff --git a/spec/selenium_spec.rb b/spec/selenium_spec.rb
-index 7de2545..6d7c1d4 100644
 --- a/spec/selenium_spec.rb
 +++ b/spec/selenium_spec.rb
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,7 @@
  require 'spec_helper'
+ require "selenium-webdriver"
  
 +<<PENDING
- module TestSessions
-   Selenium = Capybara::Session.new(:selenium, TestApp)
- end
-@@ -9,8 +10,11 @@ Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :skip => [
+ Capybara.register_driver :selenium_focus do |app|
+   profile = Selenium::WebDriver::Firefox::Profile.new
+   profile["focusmanager.testmode"] = true
+@@ -16,8 +17,11 @@ Capybara::SpecHelper.run_specs TestSessi
    :status_code,
    :trigger
  ]
@@ -31,7 +30,7 @@ index 7de2545..6d7c1d4 100644
    context 'with selenium driver' do
      before do
        @session = TestSessions::Selenium
-@@ -50,3 +54,4 @@ describe Capybara::Session do
+@@ -57,3 +61,4 @@ describe Capybara::Session do
      end
    end
  end
diff --git a/debian/patches/0004-Remove-uneeded-dependency-on-pry-in-tests.patch b/debian/patches/0004-Remove-uneeded-dependency-on-pry-in-tests.patch
index b67ef00..b70b2e5 100644
--- a/debian/patches/0004-Remove-uneeded-dependency-on-pry-in-tests.patch
+++ b/debian/patches/0004-Remove-uneeded-dependency-on-pry-in-tests.patch
@@ -7,35 +7,6 @@ Subject: Remove uneeded dependency on pry in tests
  spec/spec_helper.rb |    1 -
  2 files changed, 17 deletions(-)
 
-diff --git a/metadata.yml b/metadata.yml
-index 9fae951..8f01680 100644
---- a/metadata.yml
-+++ b/metadata.yml
-@@ -247,22 +247,6 @@ dependencies:
-     - - ! '>='
-       - !ruby/object:Gem::Version
-         version: '0'
--- !ruby/object:Gem::Dependency
--  name: pry
--  requirement: !ruby/object:Gem::Requirement
--    none: false
--    requirements:
--    - - ! '>='
--      - !ruby/object:Gem::Version
--        version: '0'
--  type: :development
--  prerelease: false
--  version_requirements: !ruby/object:Gem::Requirement
--    none: false
--    requirements:
--    - - ! '>='
--      - !ruby/object:Gem::Version
--        version: '0'
- description: Capybara is an integration testing tool for rack based web applications.
-   It simulates how a user would interact with a website
- email:
-diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
-index 03ac1f2..9650bcb 100644
 --- a/spec/spec_helper.rb
 +++ b/spec/spec_helper.rb
 @@ -1,5 +1,4 @@

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-capybara.git