jacob-mathison/tuono
1
0
Fork 0
mirror of https://github.com/tuono-labs/tuono synced 2026-07-29 13:52:46 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: apply RustRover lint suggestions (#569)

Browse Source
This commit is contained in:
Jacob Marshall
2025-02-17 07:40:03 +00:00
committed by GitHub
parent 06bc3700b7
commit b632cf43ba
6 changed files with 113 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/tuono_internal/tests/utils.rs
+1 -1
View File
@@ -43,7 +43,7 @@ impl TempTuonoProject {
impl Drop for TempTuonoProject {
fn drop(&mut self) {
// Set back the current dir in the previous state
env::set_current_dir(self.original_dir.to_owned())
env::set_current_dir(&self.original_dir)
.expect("Failed to restore the original directory.");
}
}
crates/tuono_lib/src/payload.rs
+1 -1
View File
@@ -166,7 +166,7 @@ mod tests {
use crate::manifest::BundleInfo;
fn prepare_payload<'a>(uri: Option<&'a str>, mode: Mode) -> Payload<'a> {
fn prepare_payload(uri: Option<&str>, mode: Mode) -> Payload {
let mut manifest_mock = HashMap::new();
manifest_mock.insert(
"client-main".to_string(),
crates/tuono_lib/tests/server_test.rs
+5 -5
View File
@@ -1,5 +1,5 @@
mod utils;
use crate::utils::utils::MockTuonoServer;
use crate::utils::mock_server::MockTuonoServer;
use serial_test::serial;
#[tokio::test]
@@ -15,7 +15,7 @@ async fn api_endpoint_work() {
let server_url = format!("http://{}:{}", &app.address, &app.port);
let response = client
.get(&format!("{server_url}/health_check"))
.get(format!("{server_url}/health_check"))
.send()
.await
.expect("Failed to execute request.");
@@ -38,7 +38,7 @@ async fn not_found_route() {
let server_url = format!("http://{}:{}", &app.address, &app.port);
let response = client
.get(&format!("{server_url}/not-found"))
.get(format!("{server_url}/not-found"))
.send()
.await
.expect("Failed to execute request.");
@@ -64,7 +64,7 @@ async fn index_html_route() {
let server_url = format!("http://{}:{}", &app.address, &app.port);
let response = client
.get(&format!("{server_url}/"))
.get(format!("{server_url}/"))
.send()
.await
.expect("Failed to execute request.");
@@ -91,7 +91,7 @@ async fn api_route_route() {
let server_url = format!("http://{}:{}", &app.address, &app.port);
let response = client
.get(&format!("{server_url}/tuono/data"))
.get(format!("{server_url}/tuono/data"))
.send()
.await
.expect("Failed to execute request.");
crates/tuono_lib/tests/utils/mock_server.rs
+105
View File
@@ -0,0 +1,105 @@
use fs_extra::dir::create_all;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
use std::{env, fs};
use tempfile::{tempdir, TempDir};
use tuono_lib::axum::routing::get;
use tuono_lib::{axum::Router, tuono_internal_init_v8_platform, Mode, Server};
use crate::utils::health_check::get_tuono_internal_api as health_check;
use crate::utils::route as html_route;
use crate::utils::route::tuono_internal_api as route_api;
use std::sync::Once;
static INIT: Once = Once::new();
fn init_v8() {
INIT.call_once(|| {
tuono_internal_init_v8_platform();
})
}
fn add_file_with_content<'a>(path: &'a str, content: &'a str) {
let path = PathBuf::from(path);
create_all(
path.parent().expect("File path does not have any parent"),
false,
)
.unwrap_or_else(|_| {
panic!(
"Failed to create parent file directories: {}",
path.display()
)
});
let mut file = File::create(path).expect("Failed to create the file");
file.write_all(content.as_bytes())
.expect("Failed to write into the file");
}
#[derive(Debug)]
pub struct MockTuonoServer {
pub address: String,
pub port: u16,
original_dir: PathBuf,
#[allow(dead_code)]
// Required for dropping the temp_dir when this struct drops
temp_dir: TempDir,
}
impl MockTuonoServer {
pub async fn spawn() -> Self {
init_v8();
let original_dir = env::current_dir().expect("Failed to read current_dir");
let temp_dir = tempdir().expect("Failed to create temp_dir");
let react_prod_build = fs::read_to_string("./tests/assets/fake_react_build.js")
.expect("Failed to read fake_react_build.js");
env::set_current_dir(temp_dir.path()).expect("Failed to change current dir into temp_dir");
add_file_with_content(
"./.tuono/config/config.json",
r#"{"server": {"host": "127.0.0.1", "port": 0}}"#,
);
add_file_with_content("./out/server/prod-server.js", react_prod_build.as_str());
add_file_with_content(
"./out/client/.vite/manifest.json",
r#"{"client-main.tsx": { "file": "assets/index.js", "name": "index", "src": "index.tsx", "isEntry": true,"dynamicImports": [],"css": []}}"#,
);
let router = Router::new()
.route("/", get(html_route::tuono_internal_route))
.route("/tuono/data", get(html_route::tuono_internal_api))
.route("/health_check", get(health_check))
.route("/route-api", get(route_api));
let server = Server::init(router, Mode::Prod).await;
let socket = server
.listener
.local_addr()
.expect("Failed to extract test server socket");
_ = tokio::spawn(server.start());
MockTuonoServer {
address: socket.ip().to_string(),
port: socket.port(),
original_dir,
temp_dir,
}
}
}
impl Drop for MockTuonoServer {
fn drop(&mut self) {
// Set back the current dir in the previous state
env::set_current_dir(&self.original_dir)
.expect("Failed to restore the original directory.");
}
}
crates/tuono_lib/tests/utils/mod.rs
+1 -1
View File
@@ -1,3 +1,3 @@
pub mod health_check;
pub mod mock_server;
pub mod route;
pub mod utils;
crates/tuono_lib/tests/utils/utils.rs
-106
View File
@@ -1,106 +0,0 @@
use fs_extra::dir::create_all;
use std::fs::File;
use std::io::Write;
use std::path::PathBuf;
use std::{env, fs};
use tempfile::{tempdir, TempDir};
use tuono_lib::axum::routing::get;
use tuono_lib::{axum::Router, tuono_internal_init_v8_platform, Mode, Server};
use crate::utils::health_check::get_tuono_internal_api as health_check;
use crate::utils::route as html_route;
use crate::utils::route::tuono_internal_api as route_api;
use std::sync::Once;
static INIT: Once = Once::new();
fn init_v8() {
INIT.call_once(|| {
tuono_internal_init_v8_platform();
})
}
fn add_file_with_content<'a>(path: &'a str, content: &'a str) {
let path = PathBuf::from(path);
create_all(
path.parent().expect("File path does not have any parent"),
false,
)
.expect(
format!(
"Failed to create parent file directories: {}",
path.display()
)
.as_str(),
);
let mut file = File::create(path).expect("Failed to create the file");
file.write_all(content.as_bytes())
.expect("Failed to write into the file");
}
#[derive(Debug)]
pub struct MockTuonoServer {
pub address: String,
pub port: u16,
original_dir: PathBuf,
#[allow(dead_code)]
// Required for dropping the temp_dir when this struct drops
temp_dir: TempDir,
}
impl MockTuonoServer {
pub async fn spawn() -> Self {
init_v8();
let original_dir = env::current_dir().expect("Failed to read current_dir");
let temp_dir = tempdir().expect("Failed to create temp_dir");
let react_prod_build = fs::read_to_string("./tests/assets/fake_react_build.js")
.expect("Failed to read fake_react_build.js");
env::set_current_dir(temp_dir.path()).expect("Failed to change current dir into temp_dir");
add_file_with_content(
"./.tuono/config/config.json",
r#"{"server": {"host": "127.0.0.1", "port": 0}}"#,
);
add_file_with_content("./out/server/prod-server.js", react_prod_build.as_str());
add_file_with_content(
"./out/client/.vite/manifest.json",
r#"{"client-main.tsx": { "file": "assets/index.js", "name": "index", "src": "index.tsx", "isEntry": true,"dynamicImports": [],"css": []}}"#,
);
let router = Router::new()
.route("/", get(html_route::tuono_internal_route))
.route("/tuono/data", get(html_route::tuono_internal_api))
.route("/health_check", get(health_check))
.route("/route-api", get(route_api));
let server = Server::init(router, Mode::Prod).await;
let socket = server
.listener
.local_addr()
.expect("Failed to extract test server socket");
let _ = tokio::spawn(server.start());
MockTuonoServer {
address: socket.ip().to_string(),
port: socket.port(),
original_dir,
temp_dir,
}
}
}
impl Drop for MockTuonoServer {
fn drop(&mut self) {
// Set back the current dir in the previous state
env::set_current_dir(self.original_dir.to_owned())
.expect("Failed to restore the original directory.");
}
}