Drop config param from Quire::new; always use default
Every call site was passing GlobalConfig::default(), so the
parameter adds no value. Quire::new now takes only base_dir.
The one test needing a real config (secrets) writes a config.fnl
to the tempdir and goes through Quire::load via with_config_fnl.
https://claude.ai/code/session_01W3WDZKLhnmqcipFUGDKHaD
diff --git a/quire-server/src/ci/mod.rs b/quire-server/src/ci/mod.rs
index 5d729b5..804b7d2 100644
--- a/quire-server/src/ci/mod.rs
+++ b/quire-server/src/ci/mod.rs
@@ -299,7 +299,7 @@ mod tests {
],
);
- let quire = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let quire = Quire::new(dir.path().to_path_buf());
// Initialize the database.
let mut db = crate::db::open(&quire.db_path()).expect("init db");
crate::db::migrate(&mut db).expect("migrate db");
@@ -325,7 +325,7 @@ mod tests {
],
);
- let quire = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let quire = Quire::new(dir.path().to_path_buf());
let mut db = crate::db::open(&quire.db_path()).expect("init db");
crate::db::migrate(&mut db).expect("migrate db");
drop(db);
@@ -617,7 +617,7 @@ exit 0
#[test]
fn trigger_skips_nonexistent_repo() {
let dir = tempfile::tempdir().expect("tempdir");
- let quire = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let quire = Quire::new(dir.path().to_path_buf());
let event = push_event("no-such.git", "abc123");
// Should not panic — just logs and returns.
trigger(&quire, &event);
@@ -626,7 +626,7 @@ exit 0
#[test]
fn trigger_skips_repo_not_on_disk() {
let dir = tempfile::tempdir().expect("tempdir");
- let quire = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let quire = Quire::new(dir.path().to_path_buf());
// repo name is valid but directory doesn't exist.
let event = push_event("missing.git", "abc123");
trigger(&quire, &event);
@@ -635,7 +635,7 @@ exit 0
#[test]
fn trigger_skips_invalid_repo_name() {
let dir = tempfile::tempdir().expect("tempdir");
- let quire = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let quire = Quire::new(dir.path().to_path_buf());
// Repo name with path traversal — quire.repo() returns Err.
let event = push_event("../evil.git", "abc123");
trigger(&quire, &event);
diff --git a/quire-server/src/ci/run.rs b/quire-server/src/ci/run.rs
index 6ffc7f8..929fa5a 100644
--- a/quire-server/src/ci/run.rs
+++ b/quire-server/src/ci/run.rs
@@ -567,10 +567,7 @@ mod tests {
fn tmp_quire() -> (tempfile::TempDir, Quire) {
let dir = tempfile::tempdir().expect("tempdir");
- let quire = Quire::new(
- dir.path().to_path_buf(),
- crate::quire::GlobalConfig::default(),
- );
+ let quire = Quire::new(dir.path().to_path_buf());
// Initialize the database.
let mut db = crate::db::open(&quire.db_path()).expect("init db");
crate::db::migrate(&mut db).expect("migrate db");
diff --git a/quire-server/src/quire/mod.rs b/quire-server/src/quire/mod.rs
index 54500c3..358ff06 100644
--- a/quire-server/src/quire/mod.rs
+++ b/quire-server/src/quire/mod.rs
@@ -247,10 +247,10 @@ impl Quire {
}
#[cfg(test)]
- pub fn new(base_dir: PathBuf, config: GlobalConfig) -> Self {
+ pub fn new(base_dir: PathBuf) -> Self {
Self {
base_dir,
- config,
+ config: GlobalConfig::default(),
db_pool: Arc::new(OnceLock::new()),
}
}
@@ -332,7 +332,7 @@ impl Quire {
#[cfg(test)]
impl Default for Quire {
fn default() -> Self {
- Self::new(PathBuf::from("/var/quire"), GlobalConfig::default())
+ Self::new(PathBuf::from("/var/quire"))
}
}
@@ -370,7 +370,7 @@ mod tests {
#[test]
fn repos_lists_bare_repos() {
let dir = tempfile::tempdir().expect("tempdir");
- let q = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let q = Quire::new(dir.path().to_path_buf());
let repos_dir = q.repos_dir();
// Create two bare repos.
@@ -389,7 +389,7 @@ mod tests {
#[test]
fn repos_empty_when_no_dirs() {
let dir = tempfile::tempdir().expect("tempdir");
- let q = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let q = Quire::new(dir.path().to_path_buf());
let repos: Vec<_> = q.repos().expect("repos").collect();
assert!(repos.is_empty());
}
@@ -444,7 +444,7 @@ mod tests {
#[test]
fn repo_from_path_valid() {
let dir = tempfile::tempdir().expect("tempdir");
- let q = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let q = Quire::new(dir.path().to_path_buf());
let path = dir.path().join("repos").join("foo.git");
let repo = q.repo_from_path(&path).expect("should resolve");
assert_eq!(repo.path(), path);
@@ -453,7 +453,7 @@ mod tests {
#[test]
fn repo_from_path_outside_repos() {
let dir = tempfile::tempdir().expect("tempdir");
- let q = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let q = Quire::new(dir.path().to_path_buf());
let path = PathBuf::from("/tmp/evil.git");
assert!(q.repo_from_path(&path).is_err());
}
@@ -461,7 +461,7 @@ mod tests {
#[test]
fn repo_from_path_rejects_bad_name() {
let dir = tempfile::tempdir().expect("tempdir");
- let q = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let q = Quire::new(dir.path().to_path_buf());
let path = dir.path().join("repos").join("foo"); // missing .git
assert!(q.repo_from_path(&path).is_err());
}
diff --git a/quire-server/src/quire/web/api.rs b/quire-server/src/quire/web/api.rs
index c73557e..d5186fd 100644
--- a/quire-server/src/quire/web/api.rs
+++ b/quire-server/src/quire/web/api.rs
@@ -246,12 +246,18 @@ mod tests {
impl TestEnv {
fn new() -> Self {
- Self::with_config(crate::quire::GlobalConfig::default())
+ let dir = tempfile::tempdir().expect("tempdir");
+ let quire = Quire::new(dir.path().to_path_buf());
+ let mut db = crate::db::open(&quire.db_path()).expect("db open");
+ crate::db::migrate(&mut db).expect("migrate");
+ drop(db);
+ Self { _dir: dir, quire }
}
- fn with_config(config: crate::quire::GlobalConfig) -> Self {
+ fn with_config_fnl(content: &str) -> Self {
let dir = tempfile::tempdir().expect("tempdir");
- let quire = Quire::new(dir.path().to_path_buf(), config);
+ fs_err::write(dir.path().join("config.fnl"), content).expect("write config");
+ let quire = crate::Quire::load(dir.path().to_path_buf()).expect("load config");
let mut db = crate::db::open(&quire.db_path()).expect("db open");
crate::db::migrate(&mut db).expect("migrate");
drop(db);
@@ -369,18 +375,7 @@ mod tests {
#[tokio::test]
async fn secret_returns_plaintext_value() {
- let config = {
- let dir = tempfile::tempdir().expect("tempdir");
- fs_err::write(
- dir.path().join("config.fnl"),
- r#"{:secrets {:my_token "hunter2"}}"#,
- )
- .expect("write config");
- crate::Quire::load(dir.path().to_path_buf())
- .expect("load config")
- .config
- };
- let env = TestEnv::with_config(config);
+ let env = TestEnv::with_config_fnl(r#"{:secrets {:my_token "hunter2"}}"#);
let session = ApiSession::new(3000);
env.runs()
.create(&TestEnv::meta(), Some(&session))
diff --git a/quire-server/src/quire/web/handlers.rs b/quire-server/src/quire/web/handlers.rs
index de4cf6e..65a5fe0 100644
--- a/quire-server/src/quire/web/handlers.rs
+++ b/quire-server/src/quire/web/handlers.rs
@@ -297,7 +297,7 @@ mod tests {
impl TestEnv {
fn new() -> Self {
let dir = tempfile::tempdir().expect("tempdir");
- let quire = Quire::new(dir.path().to_path_buf(), GlobalConfig::default());
+ let quire = Quire::new(dir.path().to_path_buf());
// Create repos dir + a bare repo so `quire.repo("example.git")` resolves.
let repos_dir = quire.repos_dir();