Upgrade 1.14.0

Signed-off-by: cherry530 <xuping33@huawei.com>
This commit is contained in:
cherry530 2022-07-01 17:23:33 +08:00
parent b802d7c326
commit 1eea9ff258
4 changed files with 4 additions and 106 deletions

Binary file not shown.

BIN
mocha-1.14.0.gem Normal file

Binary file not shown.

View File

@ -1,101 +0,0 @@
From a65ea1ed3dce43cbc2cc16b3660afd2cce3db33e Mon Sep 17 00:00:00 2001
From: James Mead <james@floehopper.org>
Date: Mon, 2 Mar 2015 19:37:21 +0000
Subject: [PATCH] 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.
---
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

View File

@ -1,12 +1,11 @@
%global gem_name mocha
Summary: Mocking and stubbing library
Name: rubygem-%{gem_name}
Version: 1.1.0
Version: 1.14.0
Release: 1
License: MIT or Ruby or BSD
URL: https://github.com/freerange/mocha
Source0: http://rubygems.org/gems/mocha-%{version}.gem
Patch0: rubygem-mocha-1.1.0-As-of-Ruby-v2.2-nil-is-frozen-so-these-tests-are-irrelevant.patch
BuildRequires: ruby(release) rubygems-devel ruby rubygem(metaclass) rubygem(introspection)
BuildRequires: rubygem(minitest)
BuildArch: noarch
@ -25,7 +24,6 @@ This package contains documentation for %{name}.
%setup -q -c -T
%gem_install -n %{SOURCE0}
pushd .%{gem_instdir}
%patch0 -p1
popd
%build
@ -49,7 +47,6 @@ popd
%doc %{gem_instdir}/MIT-LICENSE.md
%doc %{gem_instdir}/RELEASE.md
%dir %{gem_instdir}
%{gem_instdir}/bin
%{gem_libdir}
%exclude %{gem_cache}
%{gem_spec}
@ -61,9 +58,11 @@ popd
%{gem_instdir}/Rakefile
%{gem_instdir}/mocha.gemspec
%{gem_instdir}/gemfiles/
%{gem_instdir}/test/
%{gem_instdir}/yard-templates/
%changelog
* Fri Jul 01 2022 xu_ping <xuping33@h-partners.com> - 1.14.0-1
- Upgrade 1.14.0
* Wed Aug 5 2020 wangchong <wangchong56@huawei.com> - 1.1.0-1
- package init