[DRE-commits] [ruby-rspec] 13/18: move after fix-rake-task

[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-rspec.

commit 14782ebe5cf25d67b7c73e512d3b58c25d432a9c
Author: Cédric Boutillier <boutil at debian.org>
Date:   Wed Mar 2 18:31:27 2016 +0100

    move after fix-rake-task
---
 debian/patches/escape-path-in-match.patch | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/debian/patches/escape-path-in-match.patch b/debian/patches/escape-path-in-match.patch
index 4c5b288..3cb293a 100644
--- a/debian/patches/escape-path-in-match.patch
+++ b/debian/patches/escape-path-in-match.patch
@@ -48,29 +48,21 @@ Last-Update: 2016-03-02
  
 --- a/rspec-core/spec/rspec/core/rake_task_spec.rb
 +++ b/rspec-core/spec/rspec/core/rake_task_spec.rb
-@@ -36,7 +36,7 @@
+@@ -34,7 +34,7 @@
  
      context "default" do
        it "renders rspec" do
--        expect(spec_command).to match(/^#{ruby} #{default_load_path_opts} '?#{task.rspec_path}'?/)
-+        expect(spec_command).to match(/^#{ruby} #{default_load_path_opts} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
+-        expect(spec_command).to match(/^#{ruby} '?#{task.rspec_path}'?/)
++        expect(spec_command).to match(/^#{ruby} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
        end
      end
  
-@@ -57,14 +57,14 @@
+@@ -55,7 +55,7 @@
      context "with ruby options" do
        it "renders them before the rspec path" do
          task.ruby_opts = "-w"
--        expect(spec_command).to match(/^#{ruby} -w #{default_load_path_opts} '?#{task.rspec_path}'?/)
-+        expect(spec_command).to match(/^#{ruby} -w #{default_load_path_opts} '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
-       end
-     end
- 
-     context "with rspec_opts" do
-       it "adds the rspec_opts" do
-         task.rspec_opts = "-Ifoo"
--        expect(spec_command).to match(/#{task.rspec_path}.*-Ifoo/)
-+        expect(spec_command).to match(/#{Regexp.escape(task.rspec_path.shellescape)}.*-Ifoo/)
+-        expect(spec_command).to match(/^#{ruby} -w '?#{task.rspec_path}'?/)
++        expect(spec_command).to match(/^#{ruby} -w '?#{Regexp.escape(task.rspec_path.shellescape)}'?/)
        end
      end
  

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