[DRE-commits] [ruby-excon] 01/01: unapply patches

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository ruby-excon.

commit 9b32ebda6219dd49f8c1fa3903d7b1d7014ec69b
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed May 7 23:12:29 2014 +0200

    unapply patches
---
 lib/excon/constants.rb |  2 +-
 tests/test_helper.rb   | 13 ++-----------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/lib/excon/constants.rb b/lib/excon/constants.rb
index d4ffa82..97df63c 100644
--- a/lib/excon/constants.rb
+++ b/lib/excon/constants.rb
@@ -4,7 +4,7 @@ module Excon
 
   CR_NL = "\r\n"
 
-  DEFAULT_CA_FILE = '/etc/ssl/certs/ca-certificates.crt'
+  DEFAULT_CA_FILE = File.expand_path(File.join(File.dirname(__FILE__), "..", "..", "data", "cacert.pem"))
 
   DEFAULT_CHUNK_SIZE = 1048576 # 1 megabyte
 
diff --git a/tests/test_helper.rb b/tests/test_helper.rb
index 98d7d1a..f4ac3af 100644
--- a/tests/test_helper.rb
+++ b/tests/test_helper.rb
@@ -1,14 +1,5 @@
-# require 'rubygems' if RUBY_VERSION < '1.9'
-# require 'bundler/setup'
-
-# from gemspec
-require 'active_support'
-require 'eventmachine'
-require 'rake'
-require 'rdoc'
-require 'shindo'
-require 'sinatra'
-
+require 'rubygems' if RUBY_VERSION < '1.9'
+require 'bundler/setup'
 require 'excon'
 require 'delorean'
 require 'open4'

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