[DRE-commits] [ruby-sinatra] 03/05: Fix test failure by cherry picking upstream fix (Closes: #728633)

[Christian Hofstaedtler]

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

zeha pushed a commit to branch master
in repository ruby-sinatra.

commit 51d91b86c8a19ed8c9943fe1ab09a9e692a9f7fb
Author: Christian Hofstaedtler <zeha at debian.org>
Date:   Mon Dec 2 21:11:35 2013 +0100

    Fix test failure by cherry picking upstream fix (Closes: #728633)
---
 debian/patches/series                       |  1 +
 debian/patches/test-disable-path-protection | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d37f4d1
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+test-disable-path-protection
diff --git a/debian/patches/test-disable-path-protection b/debian/patches/test-disable-path-protection
new file mode 100644
index 0000000..6d6b7c4
--- /dev/null
+++ b/debian/patches/test-disable-path-protection
@@ -0,0 +1,19 @@
+Upstream commit: https://github.com/sinatra/sinatra/commit/c5c9f6b5501a366d5809faa44e50fad371c14870
+Fixes test failure on Ruby 1.9.
+
+Index: ruby-sinatra/test/routing_test.rb
+===================================================================
+--- ruby-sinatra.orig/test/routing_test.rb	2013-08-15 17:52:13.941606687 +0200
++++ ruby-sinatra/test/routing_test.rb	2013-12-02 21:10:15.918998018 +0100
+@@ -90,7 +90,10 @@ class RoutingTest < Test::Unit::TestCase
+   end
+ 
+   it "it handles encoded slashes correctly" do
+-    mock_app { get("/:a") { |a| a } }
++    mock_app {
++      set :protection, :except => :path_traversal
++      get("/:a") { |a| a }
++    }
+     get '/foo%2Fbar'
+     assert_equal 200, status
+     assert_body "foo/bar"

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