[DRE-commits] [ruby-thor] 02/05: Drop patch disable-some-tests

[Lucas Nussbaum]

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

lucas pushed a commit to branch master
in repository ruby-thor.

commit f7c75f1a14c4306c6fddb7bfa859cc97f6744709
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Sun Jul 2 10:02:51 2017 +0200

    Drop patch disable-some-tests
    
    ruby-simplecov, ruby-coveralls, ruby-fakeweb are now in Debian.
    Build-depend on them.
---
 debian/control                    |  5 ++-
 debian/patches/disable-some-tests | 73 ---------------------------------------
 debian/patches/series             |  1 -
 3 files changed, 4 insertions(+), 75 deletions(-)

diff --git a/debian/control b/debian/control
index bff90be..21068c0 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,10 @@ Build-Depends: bundler,
                gem2deb,
                rake,
                ruby-diff-lcs,
-               ruby-rspec (>= 2.13.0~)
+               ruby-rspec (>= 2.13.0~),
+               ruby-simplecov,
+               ruby-coveralls,
+               ruby-fakeweb
 Standards-Version: 3.9.8
 Vcs-Git: https://anonscm.debian.org/git/pkg-ruby-extras/ruby-thor.git
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ruby-extras/ruby-thor.git
diff --git a/debian/patches/disable-some-tests b/debian/patches/disable-some-tests
deleted file mode 100644
index d092cc9..0000000
--- a/debian/patches/disable-some-tests
+++ /dev/null
@@ -1,73 +0,0 @@
-This patch disables usage of simplecov, coveralls and fakeweb in the
-test suite, and is intended to be removed once these packages enter
-Debian.
-
-It also disables two tests that only test for correct usage of white-
-space and quoting, which fail because of encoding issues during build.
-
-Index: ruby-thor/spec/helper.rb
-===================================================================
---- ruby-thor.orig/spec/helper.rb
-+++ ruby-thor/spec/helper.rb
-@@ -1,18 +1,5 @@
- $TESTING = true
- 
--require "simplecov"
--require "coveralls"
--
--SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
--  SimpleCov::Formatter::HTMLFormatter,
--  Coveralls::SimpleCov::Formatter
--]
--
--SimpleCov.start do
--  add_filter "/spec/"
--  minimum_coverage(92.21)
--end
--
- $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
- require "thor"
- require "thor/group"
-@@ -21,7 +8,6 @@ require "stringio"
- require "rdoc"
- require "rspec"
- require "diff/lcs" # You need diff/lcs installed to run specs (but not to run Thor).
--require "fakeweb"  # You need fakeweb installed to run specs (but not to run Thor).
- 
- # Set shell to basic
- $0 = "thor"
-Index: ruby-thor/spec/quality_spec.rb
-===================================================================
---- ruby-thor.orig/spec/quality_spec.rb
-+++ ruby-thor/spec/quality_spec.rb
-@@ -48,7 +48,7 @@ describe "The library itself" do
-     end
-   end
- 
--  it "has no malformed whitespace" do
-+  xit "has no malformed whitespace" do
-     exempt = /\.gitmodules|\.marshal|fixtures|vendor|spec|ssl_certs|LICENSE/
-     error_messages = []
-     Dir.chdir(File.expand_path("../..", __FILE__)) do
-@@ -61,7 +61,7 @@ describe "The library itself" do
-     expect(error_messages.compact).to be_well_formed
-   end
- 
--  it "uses double-quotes consistently in specs" do
-+  xit "uses double-quotes consistently in specs" do
-     included = /spec/
-     error_messages = []
-     Dir.chdir(File.expand_path("../", __FILE__)) do
-Index: ruby-thor/spec/command_spec.rb
-===================================================================
---- ruby-thor.orig/spec/command_spec.rb
-+++ ruby-thor/spec/command_spec.rb
-@@ -56,7 +56,7 @@ describe Thor::Command do
-   end
- 
-   describe "#run" do
--    it "runs a command by calling a method in the given instance" do
-+    xit "runs a command by calling a method in the given instance" do
-       dub = double
-       expect(dub).to receive(:can_has).and_return { |*args| args }
-       expect(command.run(dub, [1, 2, 3])).to eq([1, 2, 3])
diff --git a/debian/patches/series b/debian/patches/series
index 3d8fbd9..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-disable-some-tests

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