[DRE-commits] [ruby-rspec] 04/05: Refresh disable_specs_assuming_they_are_first_caller.patch, failed_specs.patch path_to_executable.patch, skip coderay related patch for now

[Cédric Boutillier]

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

boutil pushed a commit to branch experimental
in repository ruby-rspec.

commit e3071932b35babc1d6cf3deb2eb2bc668aead67f
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat May 13 18:40:56 2017 +0200

    Refresh disable_specs_assuming_they_are_first_caller.patch, failed_specs.patch path_to_executable.patch, skip coderay related patch for now
---
 .../disable_specs_assuming_they_are_first_caller.patch |  4 ++--
 debian/patches/failed_specs.patch                      | 18 ++++++++----------
 debian/patches/path_to_executable.patch                |  4 ++--
 debian/patches/series                                  |  2 +-
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/debian/patches/disable_specs_assuming_they_are_first_caller.patch b/debian/patches/disable_specs_assuming_they_are_first_caller.patch
index 3cac437..599f271 100644
--- a/debian/patches/disable_specs_assuming_they_are_first_caller.patch
+++ b/debian/patches/disable_specs_assuming_they_are_first_caller.patch
@@ -2,11 +2,11 @@ Description: disable some failing specs
  because the backtrace contains a reference to debian/ruby-tests.rb
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
-Last-Update: 2016-03-02
+Last-Update: 2017-05-13
 
 --- a/rspec-core/spec/rspec/core/formatters/documentation_formatter_spec.rb
 +++ b/rspec-core/spec/rspec/core/formatters/documentation_formatter_spec.rb
-@@ -81,7 +81,7 @@
+@@ -94,7 +94,7 @@
      end
  
      # The backtrace is slightly different on JRuby/Rubinius so we skip there.
diff --git a/debian/patches/failed_specs.patch b/debian/patches/failed_specs.patch
index dbc39d8..969dd81 100644
--- a/debian/patches/failed_specs.patch
+++ b/debian/patches/failed_specs.patch
@@ -2,11 +2,11 @@ Description: a collection of currently failing tests
  Needs more investigation
 Forwarded: no
 Author: Cédric Boutillier <boutil at debian.org>
-Last-Update: 2016-10-02
+Last-Update: 2017-05-13
 
 --- a/rspec-core/spec/rspec/core/configuration/only_failures_support_spec.rb
 +++ b/rspec-core/spec/rspec/core/configuration/only_failures_support_spec.rb
-@@ -171,7 +171,7 @@
+@@ -204,7 +204,7 @@
        end
  
        context "and no explicit paths have been set" do
@@ -17,7 +17,7 @@ Last-Update: 2016-10-02
          end
 --- a/rspec-core/spec/rspec/core/option_parser_spec.rb
 +++ b/rspec-core/spec/rspec/core/option_parser_spec.rb
-@@ -108,17 +108,17 @@
+@@ -100,17 +100,17 @@
        end
      end
  
@@ -56,7 +56,7 @@ Last-Update: 2016-10-02
              expected_diff = <<-EOD.encode('UTF-16LE')
 --- a/rspec-core/spec/rspec/core/drb_spec.rb
 +++ b/rspec-core/spec/rspec/core/drb_spec.rb
-@@ -62,51 +62,51 @@
+@@ -62,50 +62,50 @@
      end
    end
  
@@ -98,10 +98,9 @@ Last-Update: 2016-10-02
 -      expect(result).to be(1)
 -    end
 -
--    it "outputs colorized text when running with --color option" do
+-    it "outputs colorized text when running with --force-color option" do
 -      failure_symbol = "\e[#{RSpec::Core::Formatters::ConsoleCodes.console_code_for(:red)}mF"
--      allow(out).to receive_messages(:tty? => true)
--      runner(failing_spec_filename, "--color", "--drb-port", @drb_port).run(err, out)
+-      runner(failing_spec_filename, "--force-color", "--drb-port", @drb_port).run(err, out)
 -      expect(out.string).to include(failure_symbol)
 -    end
 -  end
@@ -143,10 +142,9 @@ Last-Update: 2016-10-02
 +  #    expect(result).to be(1)
 +  #  end
 +
-+  #  it "outputs colorized text when running with --color option" do
++  #  it "outputs colorized text when running with --force-color option" do
 +  #    failure_symbol = "\e[#{RSpec::Core::Formatters::ConsoleCodes.console_code_for(:red)}mF"
-+  #    allow(out).to receive_messages(:tty? => true)
-+  #    runner(failing_spec_filename, "--color", "--drb-port", @drb_port).run(err, out)
++  #    runner(failing_spec_filename, "--force-color", "--drb-port", @drb_port).run(err, out)
 +  #    expect(out.string).to include(failure_symbol)
 +  #  end
 +  #end
diff --git a/debian/patches/path_to_executable.patch b/debian/patches/path_to_executable.patch
index 6c46c09..652b5d6 100644
--- a/debian/patches/path_to_executable.patch
+++ b/debian/patches/path_to_executable.patch
@@ -2,11 +2,11 @@ Description: fix path to rspec executable
  the relative path is different in the gem and in the installed version
 Author: Cédric Boutillier <boutil at debian.org>
 Forwarded: not-needed
-Last-Update: 2015-06-13
+Last-Update: 2017-05-13
 
 --- a/rspec-core/lib/rspec/core.rb
 +++ b/rspec-core/lib/rspec/core.rb
-@@ -151,7 +151,8 @@
+@@ -152,7 +152,8 @@
  
      # @private path to executable file.
      def self.path_to_executable
diff --git a/debian/patches/series b/debian/patches/series
index 53b6ae2..22ac9ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,4 +11,4 @@ fix-rake-task.patch
 #escape-path-in-match.patch
 #autorun-load-configuration.patch
 failed_specs.patch
-disable_coderay_highlight_specs.patch
+#disable_coderay_highlight_specs.patch

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