[DRE-commits] [ruby-capybara] 01/01: Merge 0002 and 0005 patches (selenium_spec)

[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 b5b5be6f2dd818cd73c2d7a070d01e196f09fcd7
Author: Sebastien Badia <seb at sebian.fr>
Date:   Mon Apr 28 23:39:52 2014 +0200

    Merge 0002 and 0005 patches (selenium_spec)
---
 debian/changelog                                         |  2 +-
 .../0002-Inhibit-tests-for-the-selenium-driver.patch     | 14 +++++++++-----
 .../0005-Remove-tests-using-selenium-web-driver.patch    | 16 ----------------
 debian/patches/series                                    |  1 -
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e15f7d2..1e0a0d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,7 @@ ruby-capybara (2.2.1-1) unstable; urgency=medium
   * Refresh patches against new upstream.
   * Remove require on selenium-web-driver in selenium_spec.
 
- -- Sebastien Badia <seb at sebian.fr>  Sun, 27 Apr 2014 21:42:13 +0200
+ -- Sebastien Badia <seb at sebian.fr>  Mon, 28 Apr 2014 23:39:08 +0200
 
 ruby-capybara (2.1.0-1) unstable; urgency=low
 
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 fe5b181..7756131 100644
--- a/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
+++ b/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
@@ -1,5 +1,9 @@
-From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Bobbio?= <lunar at debian.org>
+From: Jérémy Bobbio <lunar at debian.org>
 Date: Fri, 22 Mar 2013 09:10:43 +0000
+Bug-Debian: http://bugs.debian.org/703492
+Forwarded: not-needed
+Last-Update: 2014-04-28
+Reviewed-by: Sebastien Badia <seb at sebian.fr>
 Subject: Inhibit tests for the :selenium driver
 
 The :selenium driver is deactivated until ruby-selenium-webdriver lands in
@@ -10,15 +14,15 @@ Debian (see #703492), so let's just skip its tests.
 
 --- a/spec/selenium_spec.rb
 +++ b/spec/selenium_spec.rb
-@@ -1,6 +1,7 @@
+@@ -1,6 +1,6 @@
  require 'spec_helper'
- require "selenium-webdriver"
+-require "selenium-webdriver"
  
 +<<PENDING
  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
+@@ -16,8 +16,11 @@ Capybara::SpecHelper.run_specs TestSessi
    :status_code,
    :trigger
  ]
@@ -30,7 +34,7 @@ Debian (see #703492), so let's just skip its tests.
    context 'with selenium driver' do
      before do
        @session = TestSessions::Selenium
-@@ -57,3 +61,4 @@ describe Capybara::Session do
+@@ -57,3 +60,4 @@ describe Capybara::Session do
      end
    end
  end
diff --git a/debian/patches/0005-Remove-tests-using-selenium-web-driver.patch b/debian/patches/0005-Remove-tests-using-selenium-web-driver.patch
deleted file mode 100644
index c982ad0..0000000
--- a/debian/patches/0005-Remove-tests-using-selenium-web-driver.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Remove require on selenium web driver
- Until ruby-selenium-webdriver lands in Debian, see
- <http://bugs.debian.org/703492>, we remove support for the :selenium driver.
-Author: Sebastien Badia <seb at sebian.fr>
-Bug-Debian: http://bugs.debian.org/703492
-Forwarded: not-needed
-Last-Update: 2014-04-27
-
---- ruby-capybara-2.2.1.orig/spec/selenium_spec.rb
-+++ ruby-capybara-2.2.1/spec/selenium_spec.rb
-@@ -1,5 +1,4 @@
- require 'spec_helper'
--require "selenium-webdriver"
- 
- <<PENDING
- Capybara.register_driver :selenium_focus do |app|
diff --git a/debian/patches/series b/debian/patches/series
index b0a1961..03a1295 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@
 0002-Inhibit-tests-for-the-selenium-driver.patch
 0003-Inhibit-tests-that-needs-more-than-one-driver.patch
 0004-Remove-uneeded-dependency-on-pry-in-tests.patch
-0005-Remove-tests-using-selenium-web-driver.patch

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