Compare commits
No commits in common. 'epel9' and 'i9' have entirely different histories.
@ -1 +1 @@
|
||||
/mocha-*.gem
|
||||
SOURCES/mocha-1.15.0-test.tar.gz
|
||||
|
||||
@ -0,0 +1 @@
|
||||
bba0b9172e2ba37922da8cf59a285453a3090d4c SOURCES/mocha-1.15.0-test.tar.gz
|
||||
Binary file not shown.
@ -0,0 +1,34 @@
|
||||
From ae9fed4a9f2ef6267302494ae0edf515d4a8a921 Mon Sep 17 00:00:00 2001
|
||||
From: James Mead <james@floehopper.org>
|
||||
Date: Thu, 24 Nov 2022 13:26:15 +0000
|
||||
Subject: [PATCH] DRY up regexp_matches test
|
||||
|
||||
---
|
||||
test/unit/parameter_matchers/regexp_matches_test.rb | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/test/unit/parameter_matchers/regexp_matches_test.rb b/test/unit/parameter_matchers/regexp_matches_test.rb
|
||||
index e0282c859..058baaccd 100644
|
||||
--- a/test/unit/parameter_matchers/regexp_matches_test.rb
|
||||
+++ b/test/unit/parameter_matchers/regexp_matches_test.rb
|
||||
@@ -32,14 +32,18 @@ def test_should_not_match_on_empty_arguments
|
||||
end
|
||||
|
||||
def test_should_not_raise_error_on_argument_that_does_not_respond_to_equals_tilde
|
||||
- object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
|
||||
matcher = regexp_matches(/oo/)
|
||||
assert_nothing_raised { matcher.matches?([object_not_responding_to_equals_tilde]) }
|
||||
end
|
||||
|
||||
def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
|
||||
- object_not_responding_to_equals_tilde = Class.new { undef =~ }.new
|
||||
matcher = regexp_matches(/oo/)
|
||||
assert !matcher.matches?([object_not_responding_to_equals_tilde])
|
||||
end
|
||||
+
|
||||
+ private
|
||||
+
|
||||
+ def object_not_responding_to_equals_tilde
|
||||
+ Class.new { undef =~ }.new
|
||||
+ end
|
||||
end
|
||||
@ -0,0 +1,27 @@
|
||||
From 26b106a540ad57cd73401461451aa2711c541e9d Mon Sep 17 00:00:00 2001
|
||||
From: James Mead <james@floehopper.org>
|
||||
Date: Fri, 25 Nov 2022 09:04:43 +0000
|
||||
Subject: [PATCH] Fix regexp_matches tests in Ruby v3.2
|
||||
|
||||
Object#~= has been removed from Ruby v3.2 [1].
|
||||
|
||||
Closes #590.
|
||||
|
||||
[1]: https://bugs.ruby-lang.org/issues/15231
|
||||
---
|
||||
.circleci/config.yml | 1 +
|
||||
test/unit/parameter_matchers/regexp_matches_test.rb | 2 +-
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/test/unit/parameter_matchers/regexp_matches_test.rb b/test/unit/parameter_matchers/regexp_matches_test.rb
|
||||
index 058baacc..20fb7c7c 100644
|
||||
--- a/test/unit/parameter_matchers/regexp_matches_test.rb
|
||||
+++ b/test/unit/parameter_matchers/regexp_matches_test.rb
|
||||
@@ -44,6 +44,6 @@ def test_should_not_match_on_argument_that_does_not_respond_to_equals_tilde
|
||||
private
|
||||
|
||||
def object_not_responding_to_equals_tilde
|
||||
- Class.new { undef =~ }.new
|
||||
+ Class.new { undef =~ if respond_to?(:=~) }.new
|
||||
end
|
||||
end
|
||||
@ -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
|
||||
Loading…
Reference in new issue