[DRE-commits] [ruby-rabl-rails] 02/07: Remove '001_fix-minitest-autoload' and '002_remove_skipped_test' patchs

David Suárez deiv-guest at moszumanska.debian.org
Mon Oct 13 21:32:25 UTC 2014


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

deiv-guest pushed a commit to branch master
in repository ruby-rabl-rails.

commit 45d19b7fe6d36df984acc14dd8862ab286cfbea9
Author: David Suárez <david.sephirot at gmail.com>
Date:   Mon Oct 13 23:07:56 2014 +0200

    Remove '001_fix-minitest-autoload' and '002_remove_skipped_test' patchs
---
 debian/patches/001_fix-minitest-autoload.patch | 26 -------------
 debian/patches/002_remove_skipped_test.patch   | 53 --------------------------
 debian/patches/series                          |  2 -
 3 files changed, 81 deletions(-)

diff --git a/debian/patches/001_fix-minitest-autoload.patch b/debian/patches/001_fix-minitest-autoload.patch
deleted file mode 100644
index d0a1394..0000000
--- a/debian/patches/001_fix-minitest-autoload.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Description: Fix minitest autorun declaration
- MiniTest::Unit.autorun is now Minitest.autorun
-Author: Sebastien Badia <seb at sebian.fr>
-Forwarded: no
-Last-Update: 2014-05-01
-
---- a/test/test_helper.rb
-+++ b/test/test_helper.rb
-@@ -2,8 +2,8 @@ ENV["RAILS_ENV"] = "test"
- $:.unshift File.expand_path('../../lib', __FILE__)
- 
- require 'rspec/mocks'
--require 'minitest/unit'
--MiniTest::Unit.autorun
-+require 'minitest'
-+Minitest.autorun
- 
- require 'active_support/test_case'
- 
-@@ -65,4 +65,4 @@ class User
-     @name = name
-     @sex = sex
-   end
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/002_remove_skipped_test.patch b/debian/patches/002_remove_skipped_test.patch
deleted file mode 100644
index 0e60d43..0000000
--- a/debian/patches/002_remove_skipped_test.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: « extends should not overwrite nodes previously defined »
- is a skipped test but « skip » is undefined.
- (NoMethodError: undefined method `skip'), this patch disable this test.
-Author: Sebastien Badia <seb at sebian.fr>
-Forwarded: no
-Last-Update: 2014-05-01
-
---- ruby-rabl-rails-0.3.4.orig/test/compiler_test.rb
-+++ ruby-rabl-rails-0.3.4/test/compiler_test.rb
-@@ -167,22 +167,22 @@ class CompilerTest < ActiveSupport::Test
-     assert_equal({ :id => :id }, t.source)
-   end
- 
--  test "extends should not overwrite nodes previously defined" do
--    skip('Bug reported by @abrisse')
-+  #test "extends should not overwrite nodes previously defined" do
-+  #  skip('Bug reported by @abrisse')
- 
--    template = mock('file_template', :source => %(condition(-> { true }) { 'foo' }))
--    lookup_context = mock
--    lookup_context.stub(:find_template).with('users/xtnd', [], false).and_return(template)
--    RablRails::Library.reset_instance
--    RablRails::Library.instance.instance_variable_set(:@lookup_context, lookup_context)
-+  #  template = mock('file_template', :source => %(condition(-> { true }) { 'foo' }))
-+  #  lookup_context = mock
-+  #  lookup_context.stub(:find_template).with('users/xtnd', [], false).and_return(template)
-+  #  RablRails::Library.reset_instance
-+  #  RablRails::Library.instance.instance_variable_set(:@lookup_context, lookup_context)
-+
-+  #  t = @compiler.compile_source(%{
-+  #    condition(-> { false }) { 'bar' }
-+  #    extends('users/xtnd')
-+  #  })
- 
--    t = @compiler.compile_source(%{
--      condition(-> { false }) { 'bar' }
--      extends('users/xtnd')
--    })
--
--    assert_equal 2, t.source.keys.size
--  end
-+  #  assert_equal 2, t.source.keys.size
-+  #end
- 
-   test "node are compiled without evaluating the block" do
-     t = @compiler.compile_source(%{ node(:foo) { bar } })
-@@ -230,4 +230,4 @@ class CompilerTest < ActiveSupport::Test
-     assert_equal [:users, :users], @compiler.send(:extract_data_and_name, :users)
-     assert_equal [:@users, :authors], @compiler.send(:extract_data_and_name, :@users => :authors)
-   end
--end
-\ No newline at end of file
-+end
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f5e0598..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-001_fix-minitest-autoload.patch
-002_remove_skipped_test.patch

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



More information about the Pkg-ruby-extras-commits mailing list