diff --git a/crates/projection-irc/src/lib.rs b/crates/projection-irc/src/lib.rs index 26c4536..27b1d69 100644 --- a/crates/projection-irc/src/lib.rs +++ b/crates/projection-irc/src/lib.rs @@ -30,7 +30,7 @@ mod cap; use crate::cap::Capabilities; -const APP_VERSION: &str = concat!("lavina", "_", env!("CARGO_PKG_VERSION")); +pub const APP_VERSION: &str = concat!("lavina", "_", env!("CARGO_PKG_VERSION")); #[derive(Deserialize, Debug, Clone)] pub struct ServerConfig { diff --git a/crates/projection-irc/tests/lib.rs b/crates/projection-irc/tests/lib.rs index de40607..c3efd2a 100644 --- a/crates/projection-irc/tests/lib.rs +++ b/crates/projection-irc/tests/lib.rs @@ -10,8 +10,8 @@ use tokio::net::TcpStream; use lavina_core::repo::{Storage, StorageConfig}; use lavina_core::{player::PlayerRegistry, room::RoomRegistry}; +use projection_irc::APP_VERSION; use projection_irc::{launch, read_irc_message, RunningServer, ServerConfig}; - struct TestScope<'a> { reader: BufReader>, writer: WriteHalf<'a>, @@ -116,7 +116,14 @@ async fn scenario_basic() -> Result<()> { s.expect(":testserver 001 tester :Welcome to testserver Server").await?; s.expect(":testserver 002 tester :Welcome to testserver Server").await?; s.expect(":testserver 003 tester :Welcome to testserver Server").await?; - s.expect(":testserver 004 tester testserver lavina_0.0.2-dev r CFILPQbcefgijklmnopqrstvz").await?; + s.expect( + format!( + ":testserver 004 tester testserver {} r CFILPQbcefgijklmnopqrstvz", + &APP_VERSION + ) + .as_str(), + ) + .await?; s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?; s.expect_nothing().await?; s.send("QUIT :Leaving").await?; @@ -164,7 +171,14 @@ async fn scenario_cap_full_negotiation() -> Result<()> { s.expect(":testserver 001 tester :Welcome to testserver Server").await?; s.expect(":testserver 002 tester :Welcome to testserver Server").await?; s.expect(":testserver 003 tester :Welcome to testserver Server").await?; - s.expect(":testserver 004 tester testserver lavina_0.0.2-dev r CFILPQbcefgijklmnopqrstvz").await?; + s.expect( + format!( + ":testserver 004 tester testserver {} r CFILPQbcefgijklmnopqrstvz", + &APP_VERSION + ) + .as_str(), + ) + .await?; s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?; s.expect_nothing().await?; s.send("QUIT :Leaving").await?; @@ -206,7 +220,14 @@ async fn scenario_cap_short_negotiation() -> Result<()> { s.expect(":testserver 001 tester :Welcome to testserver Server").await?; s.expect(":testserver 002 tester :Welcome to testserver Server").await?; s.expect(":testserver 003 tester :Welcome to testserver Server").await?; - s.expect(":testserver 004 tester testserver lavina_0.0.2-dev r CFILPQbcefgijklmnopqrstvz").await?; + s.expect( + format!( + ":testserver 004 tester testserver {} r CFILPQbcefgijklmnopqrstvz", + &APP_VERSION + ) + .as_str(), + ) + .await?; s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?; s.expect_nothing().await?; s.send("QUIT :Leaving").await?; @@ -254,7 +275,14 @@ async fn scenario_cap_sasl_fail() -> Result<()> { s.expect(":testserver 001 tester :Welcome to testserver Server").await?; s.expect(":testserver 002 tester :Welcome to testserver Server").await?; s.expect(":testserver 003 tester :Welcome to testserver Server").await?; - s.expect(":testserver 004 tester testserver lavina_0.0.2-dev r CFILPQbcefgijklmnopqrstvz").await?; + s.expect( + format!( + ":testserver 004 tester testserver {} r CFILPQbcefgijklmnopqrstvz", + &APP_VERSION + ) + .as_str(), + ) + .await?; s.expect(":testserver 005 tester CHANTYPES=# :are supported by this server").await?; s.expect_nothing().await?; s.send("QUIT :Leaving").await?;