-
Notifications
You must be signed in to change notification settings - Fork 1
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Bump minitest from 5.25.2 to 5.25.4 #696
Open
dependabot
wants to merge
1
commit into
main
Choose a base branch
from
dependabot/bundler/minitest-5.25.4
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Bumps [minitest](https://github.com/minitest/minitest) from 5.25.2 to 5.25.4. - [Changelog](https://github.com/minitest/minitest/blob/master/History.rdoc) - [Commits](minitest/minitest@v5.25.2...v5.25.4) --- updated-dependencies: - dependency-name: minitest dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]>
gem compare minitest 5.25.2 5.25.4 Compared versions: ["5.25.2", "5.25.4"]
DIFFERENT date:
5.25.2: 2024-11-21 00:00:00 UTC
5.25.4: 2024-12-04 00:00:00 UTC
DIFFERENT version:
5.25.2: 5.25.2
5.25.4: 5.25.4
DIFFERENT files:
5.25.2->5.25.4:
* Changed:
History.rdoc +16/-0
lib/minitest.rb +1/-1
lib/minitest/mock.rb +19/-4
lib/minitest/pride_plugin.rb +1/-1
test/minitest/test_minitest_mock.rb +72/-5
test/minitest/test_minitest_spec.rb +2/-1
DIFFERENT extra_rdoc_files:
5.25.2->5.25.4:
* Changed:
History.rdoc +16/-0 |
gem compare --diff minitest 5.25.2 5.25.4 Compared versions: ["5.25.2", "5.25.4"]
DIFFERENT files:
5.25.2->5.25.4:
* Changed:
History.rdoc
--- /tmp/d20241205-1927-dvudyb/minitest-5.25.2/History.rdoc 2024-12-05 03:55:24.540861465 +0000
+++ /tmp/d20241205-1927-dvudyb/minitest-5.25.4/History.rdoc 2024-12-05 03:55:24.548861490 +0000
@@ -0,0 +1,16 @@
+=== 5.25.4 / 2024-12-03
+
+* 1 bug fix:
+
+ * Fix for must_verify definition if only requiring minitest/mock (but why?).
+
+=== 5.25.3 / 2024-12-03
+
+* 5 bug fixes:
+
+ * Fixed assert_mock to fail instead of raise on unmet mock expectations.
+ * Fixed assert_mock to take an optional message argument.
+ * Fixed formatting of unmet mock expectation messages.
+ * Fixed missing must_verify expectation to match assert_mock.
+ * minitest/pride: Fixed to use true colors with *-direct terminals (bk2204)
+
lib/minitest.rb
--- /tmp/d20241205-1927-dvudyb/minitest-5.25.2/lib/minitest.rb 2024-12-05 03:55:24.544861478 +0000
+++ /tmp/d20241205-1927-dvudyb/minitest-5.25.4/lib/minitest.rb 2024-12-05 03:55:24.548861490 +0000
@@ -13 +13 @@
- VERSION = "5.25.2" # :nodoc:
+ VERSION = "5.25.4" # :nodoc:
lib/minitest/mock.rb
--- /tmp/d20241205-1927-dvudyb/minitest-5.25.2/lib/minitest/mock.rb 2024-12-05 03:55:24.544861478 +0000
+++ /tmp/d20241205-1927-dvudyb/minitest-5.25.4/lib/minitest/mock.rb 2024-12-05 03:55:24.552861503 +0000
@@ -148,2 +148,2 @@
- raise MockExpectationError, "expected #{__call name, expected[0]}" unless actual
- raise MockExpectationError, "expected #{__call name, expected[actual.size]}, got [#{__call name, actual}]" if
+ raise MockExpectationError, "Expected #{__call name, expected[0]}" unless actual
+ raise MockExpectationError, "Expected #{__call name, expected[actual.size]}, got [#{__call name, actual}]" if
@@ -251 +251 @@
- # Assert that the mock verifies correctly.
+ # Assert that the mock verifies correctly and fail if not.
@@ -253 +253 @@
- def assert_mock mock
+ def assert_mock mock, msg = nil
@@ -254,0 +255,3 @@
+ rescue MockExpectationError => e
+ msg = message(msg) { e.message }
+ flunk msg
@@ -255,0 +259,12 @@
+end
+
+module Minitest::Expectations
+ ##
+ # See Minitest::Assertions#assert_mock.
+ #
+ # _(collection).must_verify
+ #
+ # :method: must_verify
+
+ infect_an_assertion :assert_mock, :must_verify, :unary if
+ defined?(infect_an_assertion)
lib/minitest/pride_plugin.rb
--- /tmp/d20241205-1927-dvudyb/minitest-5.25.2/lib/minitest/pride_plugin.rb 2024-12-05 03:55:24.544861478 +0000
+++ /tmp/d20241205-1927-dvudyb/minitest-5.25.4/lib/minitest/pride_plugin.rb 2024-12-05 03:55:24.552861503 +0000
@@ -13 +13 @@
- klass = ENV["TERM"] =~ /^xterm|-256color$/ ? PrideLOL : PrideIO
+ klass = ENV["TERM"] =~ /^xterm|-(?:256color|direct)$/ ? PrideLOL : PrideIO
test/minitest/test_minitest_mock.rb
--- /tmp/d20241205-1927-dvudyb/minitest-5.25.2/test/minitest/test_minitest_mock.rb 2024-12-05 03:55:24.548861490 +0000
+++ /tmp/d20241205-1927-dvudyb/minitest-5.25.4/test/minitest/test_minitest_mock.rb 2024-12-05 03:55:24.552861503 +0000
@@ -29 +29 @@
- util_verify_bad "expected meaning_of_life() => 42"
+ util_verify_bad "Expected meaning_of_life() => 42"
@@ -49 +49 @@
- util_verify_bad "expected bar() => true"
+ util_verify_bad "Expected bar() => true"
@@ -186,0 +187,67 @@
+ def test_assert_mock__pass
+ mock = Minitest::Mock.new
+ mock.expect :loose_expectation, true, [Integer]
+ mock.loose_expectation 1
+
+ result = assert_mock mock
+
+ assert_equal true, result
+ end
+
+ def assert_bad_mock klass, msg
+ mock = Minitest::Mock.new
+ mock.expect :foo, nil, [:bar]
+ mock.expect :foo, nil, [:baz]
+
+ mock.foo :bar
+
+ e = assert_raises klass do
+ yield mock
+ end
+
+ assert_equal msg, e.message
+ end
+
+ def test_verify__error
+ exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]"
+ assert_bad_mock MockExpectationError, exp do |mock|
+ mock.verify
+ end
+ end
+
+ def test_assert_mock__fail
+ exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]."
+ assert_bad_mock Minitest::Assertion, exp do |mock|
+ assert_mock mock
+ end
+ end
+
+ def test_assert_mock__fail_msg
+ exp = "BLAH.\nExpected foo(:baz) => nil, got [foo(:bar) => nil]."
+ assert_bad_mock Minitest::Assertion, exp do |mock|
+ assert_mock mock, "BLAH"
+ end
+ end
+
+ def test_assert_mock__fail_exp
+ exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]."
+ assert_bad_mock Minitest::Assertion, exp do |mock|
+ describe "X" do
+ it "y" do
+ _(mock).must_verify
+ end
+ end.new(:blah).send(:test_0001_y)
+ end
+ end
+
+ def test_assert_mock__fail_exp_msg
+ exp = "BLAH.\nExpected foo(:baz) => nil, got [foo(:bar) => nil]."
+ assert_bad_mock Minitest::Assertion, exp do |mock|
+ describe "X" do
+ it "y" do
+ _(mock).must_verify "BLAH"
+ end
+ end.new(:blah).send(:test_0001_y)
+ end
+ end
+
@@ -241 +308 @@
- exp = "expected foo(:baz) => nil, got [foo(:bar) => nil]"
+ exp = "Expected foo(:baz) => nil, got [foo(:bar) => nil]"
@@ -255 +322 @@
- exp = "expected foo(:bar) => nil, got [foo(:bar) => nil]"
+ exp = "Expected foo(:bar) => nil, got [foo(:bar) => nil]"
@@ -279 +346 @@
- exp = "expected foo(%p) => nil, got [foo(%p) => nil]" \
+ exp = "Expected foo(%p) => nil, got [foo(%p) => nil]" \
test/minitest/test_minitest_spec.rb
--- /tmp/d20241205-1927-dvudyb/minitest-5.25.2/test/minitest/test_minitest_spec.rb 2024-12-05 03:55:24.548861490 +0000
+++ /tmp/d20241205-1927-dvudyb/minitest-5.25.4/test/minitest/test_minitest_spec.rb 2024-12-05 03:55:24.552861503 +0000
@@ -214,0 +215 @@
+ must_verify
@@ -217 +218 @@
- bad = %w[not raise throw send output be_silent]
+ bad = %w[not raise throw send output be_silent verify] |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Bumps minitest from 5.25.2 to 5.25.4.
Changelog
Sourced from minitest's changelog.
Commits
d84437f
prepped for release51cfac5
- Fix for must_verify definition if only requiring minitest/mock (but why?).704d310
prepped for release2d542ff
- Fixed formatting of unmet mock expectation messages.212de90
- minitest/pride: Fixed to use true colors with *-direct terminals (bk2204)Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting
@dependabot rebase
.Dependabot commands and options
You can trigger Dependabot actions by commenting on this PR:
@dependabot rebase
will rebase this PR@dependabot recreate
will recreate this PR, overwriting any edits that have been made to it@dependabot merge
will merge this PR after your CI passes on it@dependabot squash and merge
will squash and merge this PR after your CI passes on it@dependabot cancel merge
will cancel a previously requested merge and block automerging@dependabot reopen
will reopen this PR if it is closed@dependabot close
will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually@dependabot show <dependency name> ignore conditions
will show all of the ignore conditions of the specified dependency@dependabot ignore this major version
will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this minor version
will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)@dependabot ignore this dependency
will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)