[DRE-commits] [ruby-capybara] 03/06: Refresh patches

[Jérémy Bobbio]

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

lunar pushed a commit to annotated tag debian/2.2.1-1
in repository ruby-capybara.

commit 484c930972e30eff0baed67003b8609b253a8482
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Sun May 4 13:44:50 2014 +0200

    Refresh patches
---
 ...01-Remove-support-for-the-selenium-driver.patch |  6 +++---
 ...002-Inhibit-tests-for-the-selenium-driver.patch | 23 ++++++++++++++--------
 ...bit-tests-that-needs-more-than-one-driver.patch |  2 +-
 ...Remove-uneeded-dependency-on-pry-in-tests.patch | 18 ++++++++---------
 4 files changed, 27 insertions(+), 22 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..f9cd97a 100644
--- a/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
+++ b/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
 Date: Fri, 22 Mar 2013 09:08:21 +0000
 Subject: Remove support for the :selenium driver
 
@@ -9,10 +9,10 @@ Until ruby-selenium-webdriver lands in Debian, see
  1 file changed, 4 deletions(-)
 
 diff --git a/lib/capybara.rb b/lib/capybara.rb
-index 5ec55ce..cb47a63 100644
+index efa2545..1b37aff 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..b1a915c 100644
--- a/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
+++ b/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
@@ -1,25 +1,32 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
 Date: Fri, 22 Mar 2013 09:10:43 +0000
 Subject: Inhibit tests for the :selenium driver
 
 The :selenium driver is deactivated until ruby-selenium-webdriver lands in
 Debian (see #703492), so let's just skip its tests.
 ---
- spec/selenium_spec.rb |    5 +++++
- 1 file changed, 5 insertions(+)
+ spec/selenium_spec.rb |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
 
 diff --git a/spec/selenium_spec.rb b/spec/selenium_spec.rb
-index 7de2545..6d7c1d4 100644
+index 6b94d59..2bc7219 100644
 --- a/spec/selenium_spec.rb
 +++ b/spec/selenium_spec.rb
-@@ -1,5 +1,6 @@
+@@ -1,5 +1,4 @@
  require 'spec_helper'
+-require "selenium-webdriver"
+ 
+ Capybara.register_driver :selenium_focus do |app|
+   profile = Selenium::WebDriver::Firefox::Profile.new
+@@ -7,6 +6,7 @@ Capybara.register_driver :selenium_focus do |app|
+   Capybara::Selenium::Driver.new(app, browser: :firefox, profile: profile)
+ end
  
 +<<PENDING
  module TestSessions
-   Selenium = Capybara::Session.new(:selenium, TestApp)
+   Selenium = Capybara::Session.new(:selenium_focus, TestApp)
  end
-@@ -9,8 +10,11 @@ Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :skip => [
+@@ -16,8 +16,11 @@ Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :skip => [
    :status_code,
    :trigger
  ]
@@ -31,7 +38,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 +60,4 @@ describe Capybara::Session do
      end
    end
  end
diff --git a/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch b/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch
index d74489d..546856c 100644
--- a/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch
+++ b/debian/patches/0003-Inhibit-tests-that-needs-more-than-one-driver.patch
@@ -1,4 +1,4 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
 Date: Fri, 22 Mar 2013 09:12:31 +0000
 Subject: Inhibit tests that needs more than one driver
 
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..8723cff 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
@@ -1,34 +1,32 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: =?utf-8?q?J=C3=A9r=C3=A9my_Bobbio?= <lunar at debian.org>
 Date: Fri, 28 Jun 2013 15:36:37 +0200
 Subject: Remove uneeded dependency on pry in tests
 
 ---
- metadata.yml        |   16 ----------------
+ metadata.yml        |   14 --------------
  spec/spec_helper.rb |    1 -
- 2 files changed, 17 deletions(-)
+ 2 files changed, 15 deletions(-)
 
 diff --git a/metadata.yml b/metadata.yml
-index 9fae951..8f01680 100644
+index 3a4282c..ff542e0 100644
 --- a/metadata.yml
 +++ b/metadata.yml
-@@ -247,22 +247,6 @@ dependencies:
-     - - ! '>='
+@@ -213,20 +213,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.

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