[DRE-commits] [ruby-responders] 01/02: fix test failures

[Praveen Arimbrathodiyil]

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

praveen pushed a commit to branch master
in repository ruby-responders.

commit cf0286551348aafb9d11333e4ca265fc4f1f9fc9
Author: Praveen Arimbrathodiyil <praveen at debian.org>
Date:   Fri Aug 28 22:16:16 2015 +0530

    fix test failures
---
 debian/changelog                  |  1 +
 debian/patches/rails-compat.patch | 51 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 53 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9442921..02de958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ruby-responders (2.1.0-1) UNRELEASED; urgency=medium
   * New upstream release
   * Update watch file to look at github tags
   * Add ruby-railties to depends
+  * Add rails-compat.patch to fix test failures (Closes: #781727)
 
  -- Pirate Praveen <praveen at debian.org>  Thu, 02 Apr 2015 13:33:30 +0530
 
diff --git a/debian/patches/rails-compat.patch b/debian/patches/rails-compat.patch
new file mode 100644
index 0000000..89da8a5
--- /dev/null
+++ b/debian/patches/rails-compat.patch
@@ -0,0 +1,51 @@
+From e4da9c86255e5e085b9ac683e1253c451a3163e2 Mon Sep 17 00:00:00 2001
+From: Carlos Antonio da Silva <carlosantoniodasilva at gmail.com>
+Date: Tue, 24 Mar 2015 08:54:50 -0300
+Subject: [PATCH] Update dependencies to Rails 4.1 and fix failures
+
+The change on our tests was necessary due to a bug in Rails.
+More background on c3e2d049e596bc0a76cbc0d1ef298de4926bed16.
+---
+ test/action_controller/respond_with_test.rb |  8 +++----
+
+
+diff --git a/test/action_controller/respond_with_test.rb b/test/action_controller/respond_with_test.rb
+index 94ae293..9596380 100644
+--- a/test/action_controller/respond_with_test.rb
++++ b/test/action_controller/respond_with_test.rb
+@@ -410,7 +410,7 @@ def test_using_resource_for_put_with_xml_yields_no_content_on_success
+     put :using_resource
+     assert_equal "application/xml", @response.content_type
+     assert_equal 204, @response.status
+-    assert_equal " ", @response.body
++    assert_equal "", @response.body
+   end
+ 
+   def test_using_resource_for_put_with_json_yields_no_content_on_success
+@@ -418,7 +418,7 @@ def test_using_resource_for_put_with_json_yields_no_content_on_success
+     put :using_resource_with_json
+     assert_equal "application/json", @response.content_type
+     assert_equal 204, @response.status
+-    assert_equal " ", @response.body
++    assert_equal "", @response.body
+   end
+ 
+   def test_using_resource_for_put_with_xml_yields_unprocessable_entity_on_failure
+@@ -460,7 +460,7 @@ def test_using_resource_for_delete_with_xml_yields_no_content_on_success
+     delete :using_resource
+     assert_equal "application/xml", @response.content_type
+     assert_equal 204, @response.status
+-    assert_equal " ", @response.body
++    assert_equal "", @response.body
+   end
+ 
+   def test_using_resource_for_delete_with_json_yields_no_content_on_success
+@@ -469,7 +469,7 @@ def test_using_resource_for_delete_with_json_yields_no_content_on_success
+     delete :using_resource_with_json
+     assert_equal "application/json", @response.content_type
+     assert_equal 204, @response.status
+-    assert_equal " ", @response.body
++    assert_equal "", @response.body
+   end
+ 
+   def test_using_resource_for_delete_with_html_redirects_on_failure
diff --git a/debian/patches/series b/debian/patches/series
index a51ad82..24f521b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Bundler
+rails-compat.patch

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