[DRE-commits] [yard] 05/05: refresh patches (again)

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository yard.

commit c3500a34104a2a5358767cf16248bb0743d196c0
Author: Cédric Boutillier <boutil at debian.org>
Date:   Tue Aug 2 17:13:12 2016 +0200

    refresh patches (again)
---
 debian/patches/deactivate_failing_test_with_sbuild.patch | 8 ++++----
 debian/patches/force_file_order.patch                    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/patches/deactivate_failing_test_with_sbuild.patch b/debian/patches/deactivate_failing_test_with_sbuild.patch
index a1d4aa3..0d5ba4c 100644
--- a/debian/patches/deactivate_failing_test_with_sbuild.patch
+++ b/debian/patches/deactivate_failing_test_with_sbuild.patch
@@ -5,12 +5,12 @@ Last-Update: 2016-08-02
 
 --- a/spec/registry_spec.rb
 +++ b/spec/registry_spec.rb
-@@ -74,7 +74,7 @@
+@@ -76,7 +76,7 @@
        expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to eq '/path/to/foo/doc/.yardoc'
      end
  
 -    it "returns local .yardoc path for gem if for_writing=true and dir is not writable" do
 +    xit "returns local .yardoc path for gem if for_writing=true and dir is not writable" do
-       expect(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
-       expect(File).to receive(:writable?).with(@gem.full_gem_path).and_return(false)
-       expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
+       allow(File).to receive(:writable?).with(@gem.doc_dir).and_return(false)
+       allow(File).to receive(:writable?).with(@gem.full_gem_path).and_return(false)
+       allow(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
diff --git a/debian/patches/force_file_order.patch b/debian/patches/force_file_order.patch
index b9db108..6d8b2d0 100644
--- a/debian/patches/force_file_order.patch
+++ b/debian/patches/force_file_order.patch
@@ -7,7 +7,7 @@ Last-Update: 2016-08-02
 
 --- a/lib/yard/cli/yardoc.rb
 +++ b/lib/yard/cli/yardoc.rb
-@@ -278,8 +278,8 @@
+@@ -285,8 +285,8 @@
          # Last minute modifications
          self.files = Parser::SourceParser::DEFAULT_PATH_GLOB if self.files.empty?
          self.files.delete_if {|x| x =~ /\A\s*\Z/ } # remove empty ones
@@ -18,7 +18,7 @@ Last-Update: 2016-08-02
          options.readme ||= CodeObjects::ExtraFileObject.new(readme) if readme
          options.files.unshift(options.readme).uniq! if options.readme
  
-@@ -393,6 +393,7 @@
+@@ -400,6 +400,7 @@
        # @param [Array<String>] files the set of documentation files
        def add_extra_files(*files)
          files.map! {|f| f.include?("*") ? Dir.glob(f) : f }.flatten!

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