[DRE-commits] [yard] 06/09: 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 yard.

commit ce9eeccfbc6a11ce3a747167a3929edafc642907
Author: Cédric Boutillier <boutil at debian.org>
Date:   Mon Feb 22 00:30:20 2016 +0100

    refresh patches
---
 debian/patches/deactivate_failing_test_with_sbuild.patch | 14 +++++++-------
 debian/patches/move_yard_config_to_tmp_in_spec.patch     | 13 ++++++-------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian/patches/deactivate_failing_test_with_sbuild.patch b/debian/patches/deactivate_failing_test_with_sbuild.patch
index ebc4957..7e6b7d4 100644
--- a/debian/patches/deactivate_failing_test_with_sbuild.patch
+++ b/debian/patches/deactivate_failing_test_with_sbuild.patch
@@ -1,16 +1,16 @@
 Description: deactivate one of the registry specs, failing with sbuild
 Origin: vendor
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=674327
-Last-Update: 2012-06-28
+Last-Update: 2016-02-20
 
 --- a/spec/registry_spec.rb
 +++ b/spec/registry_spec.rb
 @@ -50,7 +50,7 @@
-       Registry.yardoc_file_for_gem('foo', '>= 0', true).should == '/path/to/foo/.yardoc'
+       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to eq '/path/to/foo/.yardoc'
      end
  
--    it "should return local .yardoc path for gem if for_writing=true and dir is not writable" do
-+    xit "should return local .yardoc path for gem if for_writing=true and dir is not writable" do
-       File.should_receive(:writable?).with(@gem.full_gem_path).and_return(false)
-       Gem.source_index.should_receive(:find_name).with('foo', '>= 0').and_return([@gem])
-       Registry.yardoc_file_for_gem('foo', '>= 0', true).should =~ %r{/.yard/gem_index/foo-1.0.yardoc$}
+-    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.full_gem_path).and_return(false)
+       expect(Gem.source_index).to receive(:find_name).with('foo', '>= 0').and_return([@gem])
+       expect(Registry.yardoc_file_for_gem('foo', '>= 0', true)).to match %r{/.yard/gem_index/foo-1.0.yardoc$}
diff --git a/debian/patches/move_yard_config_to_tmp_in_spec.patch b/debian/patches/move_yard_config_to_tmp_in_spec.patch
index 424207b..01af4b1 100644
--- a/debian/patches/move_yard_config_to_tmp_in_spec.patch
+++ b/debian/patches/move_yard_config_to_tmp_in_spec.patch
@@ -4,11 +4,11 @@ Description: move YARD global configuration directory to tmp/ during specs
 Forwarded: no
 Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=738409
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2014-02-13
+Last-Update: 2016-02-20
 
 --- a/spec/config_spec.rb
 +++ b/spec/config_spec.rb
-@@ -1,8 +1,21 @@
+@@ -1,8 +1,20 @@
  require File.join(File.dirname(__FILE__), "spec_helper")
  
  require 'yaml'
@@ -26,12 +26,11 @@ Last-Update: 2014-02-13
 +    YARD::Config::CONFIG_FILE=File.join(CONFIG_DIR, 'config')
 +  end
 +
-+
-   describe '.load' do
+   describe ".load" do
      before do
-       File.should_receive(:file?).twice.with(CLI::Yardoc::DEFAULT_YARDOPTS_FILE).and_return(false)
-@@ -173,4 +186,4 @@
-       YARD::Config.load_plugins.should == false
+       expect(File).to receive(:file?).twice.with(CLI::Yardoc::DEFAULT_YARDOPTS_FILE).and_return(false)
+@@ -173,4 +185,4 @@
+       expect(YARD::Config.load_plugins).to be false
      end
    end
 -end

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