[DRE-commits] [ruby-capybara] 03/09: Refresh patches
Jérémy Bobbio
lunar at moszumanska.debian.org
Wed Sep 9 10:40:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
lunar pushed a commit to branch master
in repository ruby-capybara.
commit 7431cdf755ca47d8b18b71fbea0e9f7f61c5b1d5
Author: Jérémy Bobbio <lunar at debian.org>
Date: Wed Sep 9 11:22:57 2015 +0200
Refresh patches
---
...01-Remove-support-for-the-selenium-driver.patch | 6 +-
...002-Inhibit-tests-for-the-selenium-driver.patch | 90 +++++++++++++++++++---
...bit-tests-that-needs-more-than-one-driver.patch | 12 +--
...Remove-uneeded-dependency-on-pry-in-tests.patch | 19 ++---
4 files changed, 100 insertions(+), 27 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 f9cd97a..266f98b 100644
--- a/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
+++ b/debian/patches/0001-Remove-support-for-the-selenium-driver.patch
@@ -5,14 +5,14 @@ Subject: Remove support for the :selenium driver
Until ruby-selenium-webdriver lands in Debian, see
<http://bugs.debian.org/703492>, we remove support for the :selenium driver.
---
- lib/capybara.rb | 4 ----
+ lib/capybara.rb | 4 ----
1 file changed, 4 deletions(-)
diff --git a/lib/capybara.rb b/lib/capybara.rb
-index efa2545..1b37aff 100644
+index bd46520..b3cdd93 100644
--- a/lib/capybara.rb
+++ b/lib/capybara.rb
-@@ -361,7 +361,3 @@ end
+@@ -392,7 +392,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 b1a915c..9a35cf1 100644
--- a/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
+++ b/debian/patches/0002-Inhibit-tests-for-the-selenium-driver.patch
@@ -5,11 +5,49 @@ 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 | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
+ spec/rspec/matchers_spec.rb | 4 ++++
+ spec/selenium_spec.rb | 8 ++++++--
+ spec/selenium_spec_chrome.rb | 3 ++-
+ 3 files changed, 12 insertions(+), 3 deletions(-)
+diff --git a/spec/rspec/matchers_spec.rb b/spec/rspec/matchers_spec.rb
+index 3279256..b5151ad 100644
+--- a/spec/rspec/matchers_spec.rb
++++ b/spec/rspec/matchers_spec.rb
+@@ -539,6 +539,7 @@ RSpec.describe Capybara::RSpecMatchers do
+ end
+
+ context 'with wait' do
++ pending 'waiting for a ruby-selenium-driver package in Debian' do
+ before(:each) do
+ @session = TestSessions::Selenium
+ @session.visit('/with_js')
+@@ -558,6 +559,7 @@ RSpec.describe Capybara::RSpecMatchers do
+ end
+ end
+ end
++ end
+ end
+
+ it "supports compounding" do
+@@ -584,6 +586,7 @@ RSpec.describe Capybara::RSpecMatchers do
+ end
+
+ context 'with wait' do
++ pending 'waiting for a ruby-selenium-driver package in Debian' do
+ before(:each) do
+ @session = TestSessions::Selenium
+ @session.visit('/with_js')
+@@ -603,6 +606,7 @@ RSpec.describe Capybara::RSpecMatchers do
+ end
+ end
+ end
++ end
+ end
+
+ it "supports compounding" do
diff --git a/spec/selenium_spec.rb b/spec/selenium_spec.rb
-index 6b94d59..2bc7219 100644
+index 90f58ec..7c35b2a 100644
--- a/spec/selenium_spec.rb
+++ b/spec/selenium_spec.rb
@@ -1,5 +1,4 @@
@@ -26,20 +64,54 @@ index 6b94d59..2bc7219 100644
module TestSessions
Selenium = Capybara::Session.new(:selenium_focus, TestApp)
end
-@@ -16,8 +16,11 @@ Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :skip => [
+@@ -16,9 +16,11 @@ Capybara::SpecHelper.run_specs TestSessions::Selenium, "selenium", :capybara_ski
:status_code,
:trigger
]
+PENDING
- describe Capybara::Session do
-+pending "waiting for a ruby-selenium-driver package in Debian" do
-+
+ RSpec.describe Capybara::Session do
context 'with selenium driver' do
++ pending "waiting for a ruby-selenium-driver package in Debian" do
before do
@session = TestSessions::Selenium
-@@ -57,3 +60,4 @@ describe Capybara::Session do
+ end
+@@ -109,8 +111,10 @@ RSpec.describe Capybara::Session do
+ end
+ end
+ end
++ end
+ end
+
++<<PENDING
+ RSpec.describe Capybara::Selenium::Driver do
+ before do
+ @driver = Capybara::Selenium::Driver.new(TestApp, browser: :firefox)
+@@ -125,4 +129,4 @@ RSpec.describe Capybara::Selenium::Driver do
end
end
end
-+end
+-
++PENDING
+diff --git a/spec/selenium_spec_chrome.rb b/spec/selenium_spec_chrome.rb
+index 4ca0163..328da2b 100644
+--- a/spec/selenium_spec_chrome.rb
++++ b/spec/selenium_spec_chrome.rb
+@@ -1,11 +1,11 @@
+ require 'spec_helper'
+-require 'selenium-webdriver'
+
+ Capybara.register_driver :selenium_chrome do |app|
+ args = ENV['TRAVIS'] ? ['no-sandbox' ] : []
+ Capybara::Selenium::Driver.new(app, :browser => :chrome, :args => args)
+ end
+
++<<PENDING
+ module TestSessions
+ Chrome = Capybara::Session.new(:selenium_chrome, TestApp)
+ end
+@@ -15,3 +15,4 @@ Capybara::SpecHelper.run_specs TestSessions::Chrome, "selenium_chrome", :capybar
+ :status_code,
+ :trigger
+ ] unless ENV['TRAVIS'] && (RUBY_PLATFORM == 'java')
++PENDING
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 546856c..56f1661 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
@@ -5,25 +5,25 @@ Subject: Inhibit tests that needs more than one driver
As the :selenium driver is deactivated, there's only one driver left currently
(:rack_test). This means we have to skip tests that needs more than one driver.
---
- spec/dsl_spec.rb | 2 ++
+ spec/dsl_spec.rb | 2 ++
1 file changed, 2 insertions(+)
diff --git a/spec/dsl_spec.rb b/spec/dsl_spec.rb
-index cce248d..b4e6286 100644
+index 88c60cc..3a87b64 100644
--- a/spec/dsl_spec.rb
+++ b/spec/dsl_spec.rb
-@@ -157,12 +157,14 @@ describe Capybara::DSL do
+@@ -160,12 +160,14 @@ RSpec.describe Capybara::DSL do
end
it "should change with the current driver" do
+ pending 'waiting to have ruby-capybara-webkit or ruby-selenium-driver in Debian'
- Capybara.current_session.mode.should == :rack_test
+ expect(Capybara.current_session.mode).to eq(:rack_test)
Capybara.current_driver = :selenium
- Capybara.current_session.mode.should == :selenium
+ expect(Capybara.current_session.mode).to eq(:selenium)
end
it "should be persistent even across driver changes" do
+ pending 'waiting to have for ruby-capybara-webkit or ruby-selenium-driver in Debian'
object_id = Capybara.current_session.object_id
- Capybara.current_session.object_id.should == object_id
+ expect(Capybara.current_session.object_id).to eq(object_id)
Capybara.current_driver = :selenium
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 8723cff..6b06c91 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
@@ -3,40 +3,41 @@ Date: Fri, 28 Jun 2013 15:36:37 +0200
Subject: Remove uneeded dependency on pry in tests
---
- metadata.yml | 14 --------------
- spec/spec_helper.rb | 1 -
+ metadata.yml | 14 --------------
+ spec/spec_helper.rb | 1 -
2 files changed, 15 deletions(-)
diff --git a/metadata.yml b/metadata.yml
-index 3a4282c..ff542e0 100644
+index 4b74b3f..bca9c65 100644
--- a/metadata.yml
+++ b/metadata.yml
-@@ -213,20 +213,6 @@ dependencies:
- - - '>='
+@@ -193,20 +193,6 @@ dependencies:
+ - - ">="
- !ruby/object:Gem::Version
version: '0'
-- !ruby/object:Gem::Dependency
- name: pry
- requirement: !ruby/object:Gem::Requirement
- requirements:
-- - - '>='
+- - - ">="
- - !ruby/object:Gem::Version
- version: '0'
- type: :development
- prerelease: false
- version_requirements: !ruby/object:Gem::Requirement
- 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
+index 345e1db..2c7d968 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
-@@ -1,5 +1,4 @@
+@@ -1,6 +1,5 @@
+ require 'rspec/expectations'
require "capybara/spec/spec_helper"
-require "pry"
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-capybara.git
More information about the Pkg-ruby-extras-commits
mailing list