From 2579a827fcc570ae98ea77b57a632fb914f9466f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 11:40:49 +0100
Subject: [PATCH] Bump mockito from 0.32.5 to 1.0.0 (#8426)
Bumps [mockito](https://github.com/lipanski/mockito) from 0.32.5 to
1.0.0.
Release notes
Sourced from mockito's
releases.
1.0.0
:balloon: 7 years and 63 releases later, it's finally time for the
1.0 :balloon:
Changes
- [Breaking] The legacy interface was removed in this
version
- [Breaking]
Mock::with_body_from_fn
was
renamed to Mock::with_chunked_body
- the former is still
supported with a deprecation warning
- Mocks are only cleared when the server is dropped, not when the mock
is dropped - this means you don't have to assign mocks to
variables any more (unless you want to call other methods on
them)
- Introduced the
Mock::remove
and
Mock::remove_async
methods to remove mocks on demand
Major changes since 0.31
- Tests can now run in parallel
- Support for HTTP2
- An async interface for all actions (though the sync interface is
also available)
- Mock multiple server/hosts at the same time
For a list of all the changes please check the release log.
Migrating to the new API
Legacy API:
let m1 = mockito::mock("GET",
"/hello").with_body("hello").create();
let m2 = mockito::mock("GET",
"/bye").with_body("bye").create();
// Use one of these to configure your client
let host = mockito:server_address();
let url = mockito::server_url();
New API:
let mut server = mockito::Server::new();
server.mock("GET",
"/hello").with_body("hello").create();
server.mock("GET",
"/bye").with_body("bye").create();
// Use one of these to configure your client
let host = server.host_with_port();
let url = server.url();
If you can't migrate to the new API in one go, consider using version
0.32.5, which supports both the legacy API as well as the new API.
Migrating to the async API
In order to write async tests, you'll need to use the
_async
methods:
... (truncated)
Commits
9a07811
Bump to 1.0.0
000c435
Merge pull request #165
from lipanski/one-zero
68c5629
Remove mocks when the server is dropped, not when the mock is
dropped
ac9042d
Add the Windows line-ending fix to the test runner
0ce9788
Disable color tests on Windows
ad2ebcb
Fine-tuning the Windows test runner
abb9e91
Run Windows tests on Github Actions
5a7c96e
Rename Mock::with_body_from_fn to Mock::with_chunked_body
ed338fa
Uncomment threads tests
6e2064d
Drop legacy interface
- Additional commits viewable in compare
view
[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=mockito&package-manager=cargo&previous-version=0.32.5&new-version=1.0.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)
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-automerge-start)
[//]: # (dependabot-automerge-end)
---
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 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)
Signed-off-by: dependabot[bot]
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
Cargo.lock | 4 ++--
crates/nu-command/Cargo.toml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 4f63b90bb6..fb5e32575d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2497,9 +2497,9 @@ dependencies = [
[[package]]
name = "mockito"
-version = "0.32.5"
+version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "406f43768da5a859ce19bb0978fd8dc2167a7d9a52f3935c6a187242e1a4ff9f"
+checksum = "8c1eecc3baf782e3c8d6803cc8780268da1f32df6eb88c016c1d80b0df7944cf"
dependencies = [
"assert-json-diff",
"colored",
diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml
index e776721a7e..511a2bd07d 100644
--- a/crates/nu-command/Cargo.toml
+++ b/crates/nu-command/Cargo.toml
@@ -157,7 +157,7 @@ which-support = ["which"]
[dev-dependencies]
nu-test-support = { path = "../nu-test-support", version = "0.77.1" }
-mockito = "0.32.3"
+mockito = "1.0.0"
dirs-next = "2.0.0"
hamcrest2 = "0.3.0"