[DRE-commits] [ruby-timecop] 02/04: refresh 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-timecop.

commit 26d1d22f40ab2d5aa231a4f935630ff79305f5e5
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue May 26 23:33:25 2015 +0200

    refresh patches
---
 debian/patches/fix_path_require.patch       | 32 +++++++++++++----------------
 debian/patches/test_helper.rb_editing.patch |  8 ++++----
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/debian/patches/fix_path_require.patch b/debian/patches/fix_path_require.patch
index 7241d9d..3bfda4f 100644
--- a/debian/patches/fix_path_require.patch
+++ b/debian/patches/fix_path_require.patch
@@ -2,28 +2,26 @@ Description: use an absolute path to the timecop library
  instead of a relative ../lib/. The local lib/ is moved away when running
  autopkgtest suite.
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-08-31
+Last-Update: 2015-05-26
 
 --- a/test/timecop_test.rb
 +++ b/test/timecop_test.rb
-@@ -1,6 +1,6 @@
- require 'date'
+@@ -1,5 +1,5 @@
  require File.join(File.dirname(__FILE__), "test_helper")
 -require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
-+require 'timecop'
++require "timecop"
  
- class TestTimecop < Test::Unit::TestCase
+ class TestTimecop < Minitest::Unit::TestCase
    def teardown
 --- a/test/timecop_without_date_test.rb
 +++ b/test/timecop_without_date_test.rb
-@@ -1,6 +1,6 @@
- 
+@@ -1,5 +1,5 @@
  require File.join(File.dirname(__FILE__), "test_helper")
 -require File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
-+require 'timecop'
++require "timecop"
+ 
+ class TestTimecopWithoutDate < Minitest::Unit::TestCase
  
- class TestTimecopWithoutDate < Test::Unit::TestCase
-   
 --- a/test/time_stack_item_test.rb
 +++ b/test/time_stack_item_test.rb
 @@ -1,6 +1,6 @@
@@ -36,17 +34,15 @@ Last-Update: 2014-08-31
  
 --- a/test/timecop_without_date_but_with_time_test.rb
 +++ b/test/timecop_without_date_but_with_time_test.rb
-@@ -1,12 +1,11 @@
- require "test/unit"
+@@ -1,10 +1,9 @@
+ require File.join(File.dirname(__FILE__), "test_helper")
  
- class TestTimecopWithoutDateButWithTime < Test::Unit::TestCase
+ class TestTimecopWithoutDateButWithTime < Minitest::Unit::TestCase
 -  TIMECOP_LIB = File.join(File.dirname(__FILE__), '..', 'lib', 'timecop')
  
    def test_loads_properly_when_time_is_required_instead_of_date
-     assert_nothing_raised do
-       require "time"
--      require TIMECOP_LIB
-+      require "timecop"
-     end
+     require "time"
+-    require TIMECOP_LIB
++    require "timecop"
    end
  end
diff --git a/debian/patches/test_helper.rb_editing.patch b/debian/patches/test_helper.rb_editing.patch
index 8d86a51..2425066 100644
--- a/debian/patches/test_helper.rb_editing.patch
+++ b/debian/patches/test_helper.rb_editing.patch
@@ -1,12 +1,12 @@
 Description: Remove requirements on bundler and rubygems
 Author: Nandaja Varma <nandaja.varma at gmail.com>
 Forwarded: No
-Last-Update: 2013-01-07
+Last-Update: 2015-05-26
 --- a/test/test_helper.rb
 +++ b/test/test_helper.rb
 @@ -1,5 +1,3 @@
 -require 'rubygems'
 -require 'bundler/setup'
- require 'test/unit'
- begin
-   require 'mocha/setup'
+ require 'minitest/autorun'
+ 
+ $VERBOSE = true # enable ruby warnings

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