From 2c6d83935c1afb08870d4378c6e83ab0c8480e9b Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 16 Mar 2024 12:48:11 +0100
Subject: [PATCH] Update Rust crate mockito to 1.4.0 (#154)

* Update Rust crate mockito to 1.4.0

* Switch to async constructor

Mockito, by default, starts its own async runtime for the mock server.
This creates issues in async tests, which are already executed within a
runtime.

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Jan David <jdno@jdno.dev>
---
 Cargo.lock            | 61 ++++++++++++++++++++++++++++++++++++++++---
 Cargo.toml            |  2 +-
 src/github/library.rs |  8 +++---
 3 files changed, 63 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a2e6877..9c68325 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -771,6 +771,16 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
+[[package]]
+name = "lock_api"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+dependencies = [
+ "autocfg",
+ "scopeguard",
+]
+
 [[package]]
 name = "log"
 version = "0.4.17"
@@ -808,13 +818,13 @@ dependencies = [
 
 [[package]]
 name = "mockito"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8c84fe1f1d8c56dc157f79942056fad4b9efceebba374a01b222428b553facb"
+checksum = "d2f6e023aa5bdf392aa06c78e4a4e6d498baab5138d0c993503350ebbc37bf1e"
 dependencies = [
  "assert-json-diff",
  "colored",
- "futures",
+ "futures-core",
  "hyper 0.14.26",
  "log",
  "rand",
@@ -925,6 +935,29 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "parking_lot"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+dependencies = [
+ "lock_api",
+ "parking_lot_core",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall",
+ "smallvec",
+ "windows-targets 0.48.0",
+]
+
 [[package]]
 name = "pem"
 version = "3.0.2"
@@ -1027,6 +1060,15 @@ dependencies = [
  "getrandom",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
 [[package]]
 name = "regex"
 version = "1.8.1"
@@ -1146,6 +1188,12 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
 [[package]]
 name = "secrecy"
 version = "0.8.0"
@@ -1270,6 +1318,12 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "smallvec"
+version = "1.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
+
 [[package]]
 name = "snafu"
 version = "0.7.4"
@@ -1428,6 +1482,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
+ "parking_lot",
  "pin-project-lite",
  "socket2",
  "tokio-macros",
diff --git a/Cargo.toml b/Cargo.toml
index 4fb997e..3ddf311 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -40,7 +40,7 @@ typed-builder = "0.18.1"
 url = "2.5.0"
 
 [dev-dependencies]
-mockito = "1.3.0"
+mockito = "1.4.0"
 serde_json = "1.0.114"
 tempfile = "3.10.0"
 serde_yaml = { version = "0.9.32" }
diff --git a/src/github/library.rs b/src/github/library.rs
index 9aaf1a0..a484e23 100644
--- a/src/github/library.rs
+++ b/src/github/library.rs
@@ -177,7 +177,7 @@ mod tests {
 
     #[tokio::test]
     async fn workflow() {
-        let mut server = mockito::Server::new();
+        let mut server = mockito::Server::new_async().await;
         let mock = server
             .mock("GET", "/repos/owner/name/contents/test/workflow.yml")
             .match_query(mockito::Matcher::Any)
@@ -198,7 +198,7 @@ mod tests {
 
     #[tokio::test]
     async fn job() {
-        let mut server = mockito::Server::new();
+        let mut server = mockito::Server::new_async().await;
         let mock = server
             .mock("GET", "/repos/owner/name/contents/test/job.yml")
             .match_query(mockito::Matcher::Any)
@@ -261,7 +261,7 @@ mod tests {
 
     #[tokio::test]
     async fn fetch_from_github() {
-        let mut server = mockito::Server::new();
+        let mut server = mockito::Server::new_async().await;
         let mock = server
             .mock("GET", "/repos/owner/name/contents/test/workflow.yml")
             .match_query(mockito::Matcher::Any)
@@ -284,7 +284,7 @@ mod tests {
 
     #[tokio::test]
     async fn fetch_from_github_not_found() {
-        let mut server = mockito::Server::new();
+        let mut server = mockito::Server::new_async().await;
         let mock = server
             .mock("GET", "/repos/owner/name/contents/test/workflow.yml")
             .match_query(mockito::Matcher::Any)