From 40d7bc13027e8c0e9acc19a86144116ea45d4cd0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Dec 2024 14:30:23 +0000 Subject: [PATCH 1/2] Update tokio-tungstenite requirement from 0.24 to 0.25 Updates the requirements on [tokio-tungstenite](https://github.com/snapview/tokio-tungstenite) to permit the latest version. - [Changelog](https://github.com/snapview/tokio-tungstenite/blob/master/CHANGELOG.md) - [Commits](https://github.com/snapview/tokio-tungstenite/compare/v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: tokio-tungstenite dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- juniper_axum/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/juniper_axum/Cargo.toml b/juniper_axum/Cargo.toml index 67a8bbb0e..0fbba58dd 100644 --- a/juniper_axum/Cargo.toml +++ b/juniper_axum/Cargo.toml @@ -43,7 +43,7 @@ futures = "0.3.22" juniper = { version = "0.16", path = "../juniper", features = ["expose-test-schema"] } tokio = { version = "1.20", features = ["macros", "net", "rt-multi-thread", "time"] } tokio-stream = "0.1" -tokio-tungstenite = "0.24" +tokio-tungstenite = "0.25" tower-service = "0.3" tracing = "0.1" tracing-subscriber = "0.3" From 8044240f334f3e263ba63ff679cfbc191b2313ad Mon Sep 17 00:00:00 2001 From: tyranron Date: Mon, 16 Dec 2024 16:56:24 +0100 Subject: [PATCH 2/2] Fix --- juniper_axum/tests/ws_test_suite.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/juniper_axum/tests/ws_test_suite.rs b/juniper_axum/tests/ws_test_suite.rs index 01bc071e4..bd5a0886e 100644 --- a/juniper_axum/tests/ws_test_suite.rs +++ b/juniper_axum/tests/ws_test_suite.rs @@ -75,7 +75,7 @@ impl TestApp { ) -> Result<(), anyhow::Error> { match message { WsIntegrationMessage::Send(msg) => websocket - .send(Message::Text(msg.to_string())) + .send(Message::Text(msg.to_string().into())) .await .map_err(|e| anyhow!("Could not send message: {e}")) .map(drop), @@ -88,7 +88,7 @@ impl TestApp { None => Err(anyhow!("No message received")), Some(Err(e)) => Err(anyhow!("WebSocket error: {e}")), Some(Ok(Message::Text(json))) => { - let actual: serde_json::Value = serde_json::from_str(&json) + let actual: serde_json::Value = serde_json::from_str(json.as_str()) .map_err(|e| anyhow!("Cannot deserialize received message: {e}"))?; if actual != expected { return Err(anyhow!(