[DRE-commits] [ruby-mocha] 01/01: add ruby22_nil_frozen.patch from upstream to ignore some tests with Ruby2.2

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

commit e316f2c3595dbe4ea407eb9a12536c12618fd121
Author: Cédric Boutillier <boutil at debian.org>
Date:   Thu Aug 13 08:38:44 2015 +0200

    add ruby22_nil_frozen.patch from upstream to ignore some tests with Ruby2.2
---
 debian/changelog                       |   7 +++
 debian/patches/ruby22_nil_frozen.patch | 100 +++++++++++++++++++++++++++++++++
 debian/patches/series                  |   1 +
 3 files changed, 108 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1f7f50e..13d012d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ruby-mocha (1.1.0-2) unstable; urgency=medium
+
+  * Add ruby22_nil_frozen.patch from upstream to ignore some tests with
+    Ruby2.2, dealing with nil (Closes: #794271)
+
+ -- Cédric Boutillier <boutil at debian.org>  Thu, 13 Aug 2015 08:38:48 +0200
+
 ruby-mocha (1.1.0-1) unstable; urgency=medium
 
   * Imported Upstream version 1.1.0
diff --git a/debian/patches/ruby22_nil_frozen.patch b/debian/patches/ruby22_nil_frozen.patch
new file mode 100644
index 0000000..cce345d
--- /dev/null
+++ b/debian/patches/ruby22_nil_frozen.patch
@@ -0,0 +1,100 @@
+Description: As of Ruby v2.2, nil is frozen so these tests are irrelevant.
+ In all these scenarios in the latest versions of Ruby, a `Mocha::StubbingError`
+ will be raised with the message: "can't stub method on frozen object: nil".
+ .
+ This behaviour is already tested in the more generic `StubbingFrozenObjectTest`
+ and so it's safe to ignore these tests for the relevant versions of Ruby.
+Author: James Mead <james at floehopper.org>
+Origin: upstream,https://github.com/freerange/mocha/commit/a65ea1ed3dce43cbc2cc16b3660afd2cce3db33e.patch
+Last-Update: 2015-03-02
+---
+ test/acceptance/stubbing_nil_test.rb | 68 +++++++++++++++++++-----------------
+ 1 file changed, 35 insertions(+), 33 deletions(-)
+
+diff --git a/test/acceptance/stubbing_nil_test.rb b/test/acceptance/stubbing_nil_test.rb
+index ac163e7..f8c55cd 100644
+--- a/test/acceptance/stubbing_nil_test.rb
++++ b/test/acceptance/stubbing_nil_test.rb
+@@ -13,47 +13,49 @@ def teardown
+     teardown_acceptance_test
+   end
+ 
+-  def test_should_allow_stubbing_method_on_nil
+-    Mocha::Configuration.allow(:stubbing_method_on_nil)
+-    test_result = run_as_test do
+-      nil.stubs(:stubbed_method)
++  if RUBY_VERSION < '2.2.0'
++    def test_should_allow_stubbing_method_on_nil
++      Mocha::Configuration.allow(:stubbing_method_on_nil)
++      test_result = run_as_test do
++        nil.stubs(:stubbed_method)
++      end
++      assert_passed(test_result)
++      assert !@logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
+     end
+-    assert_passed(test_result)
+-    assert !@logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
+-  end
+ 
+-  def test_should_warn_on_stubbing_method_on_nil
+-    Mocha::Configuration.warn_when(:stubbing_method_on_nil)
+-    test_result = run_as_test do
+-      nil.stubs(:stubbed_method)
++    def test_should_warn_on_stubbing_method_on_nil
++      Mocha::Configuration.warn_when(:stubbing_method_on_nil)
++      test_result = run_as_test do
++        nil.stubs(:stubbed_method)
++      end
++      assert_passed(test_result)
++      assert @logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
+     end
+-    assert_passed(test_result)
+-    assert @logger.warnings.include?("stubbing method on nil: nil.stubbed_method")
+-  end
+ 
+-  def test_should_prevent_stubbing_method_on_nil
+-    Mocha::Configuration.prevent(:stubbing_method_on_nil)
+-    test_result = run_as_test do
+-      nil.stubs(:stubbed_method)
++    def test_should_prevent_stubbing_method_on_nil
++      Mocha::Configuration.prevent(:stubbing_method_on_nil)
++      test_result = run_as_test do
++        nil.stubs(:stubbed_method)
++      end
++      assert_failed(test_result)
++      assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
+     end
+-    assert_failed(test_result)
+-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
+-  end
+ 
+-  def test_should_default_to_prevent_stubbing_method_on_non_mock_object
+-    test_result = run_as_test do
+-      nil.stubs(:stubbed_method)
++    def test_should_default_to_prevent_stubbing_method_on_non_mock_object
++      test_result = run_as_test do
++        nil.stubs(:stubbed_method)
++      end
++      assert_failed(test_result)
++      assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
+     end
+-    assert_failed(test_result)
+-    assert test_result.error_messages.include?("Mocha::StubbingError: stubbing method on nil: nil.stubbed_method")
+-  end
+ 
+-  def test_should_allow_stubbing_method_on_non_nil_object
+-    Mocha::Configuration.prevent(:stubbing_method_on_nil)
+-    object = Object.new
+-    test_result = run_as_test do
+-      object.stubs(:stubbed_method)
++    def test_should_allow_stubbing_method_on_non_nil_object
++      Mocha::Configuration.prevent(:stubbing_method_on_nil)
++      object = Object.new
++      test_result = run_as_test do
++        object.stubs(:stubbed_method)
++      end
++      assert_passed(test_result)
+     end
+-    assert_passed(test_result)
+   end
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 328fe79..e1bd8a6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 deactivate_failing_tests.patch
 privacy_breach.patch
+ruby22_nil_frozen.patch

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