Skip to content
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.

Sign up for GitHub

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

Update tokio-tungstenite requirement from 0.24 to 0.25 #1298

Merged
merged 3 commits into from
Dec 16, 2024
Merged

Update tokio-tungstenite requirement from 0.24 to 0.25 #1298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
40d7bc1
Update tokio-tungstenite requirement from 0.24 to 0.25
dependabot[bot] Dec 16, 2024
c2383e5
Merge branch 'master' into dependabot/cargo/tokio-tungstenite-0.25
tyranron Dec 16, 2024
8044240
Fix
tyranron Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion juniper_axum/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions juniper_axum/tests/ws_test_suite.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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!(
Expand Down
Loading