trustpub: Move list tests to list::by_crate

Turbo87 · Turbo87 · commit 7a46a07aae5b · 2025-12-05T11:45:39.000+01:00
diff --git a/src/tests/routes/trustpub/github_configs/list/by_crate.rs b/src/tests/routes/trustpub/github_configs/list/by_crate.rs
@@ -1,3 +1,4 @@
+use super::URL;
 use crate::builders::CrateBuilder;
 use crate::util::{RequestHelper, TestApp};
 use crates_io_database::models::token::{CrateScope, EndpointScope};
@@ -7,8 +8,6 @@ use diesel_async::AsyncPgConnection;
 use insta::{assert_json_snapshot, assert_snapshot};
 use serde_json::json;
 
-const URL: &str = "/api/v1/trusted_publishing/github_configs";
-
 async fn create_config(
     conn: &mut AsyncPgConnection,
     crate_id: i32,
@@ -123,17 +122,6 @@ async fn test_crate_not_found() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn test_no_query_param() -> anyhow::Result<()> {
-    let (_, _, cookie_client) = TestApp::full().with_user().await;
-
-    let response = cookie_client.get::<()>(URL).await;
-    assert_snapshot!(response.status(), @"400 Bad Request");
-    assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"Failed to deserialize query string: missing field `crate`"}]}"#);
-
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn test_crate_with_no_configs() -> anyhow::Result<()> {
     let (app, _, cookie_client) = TestApp::full().with_user().await;
diff --git a/src/tests/routes/trustpub/github_configs/list/mod.rs b/src/tests/routes/trustpub/github_configs/list/mod.rs
@@ -0,0 +1,17 @@
+use crate::util::{RequestHelper, TestApp};
+use insta::assert_snapshot;
+
+mod by_crate;
+
+pub const URL: &str = "/api/v1/trusted_publishing/github_configs";
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_no_query_param() -> anyhow::Result<()> {
+    let (_, _, cookie_client) = TestApp::full().with_user().await;
+
+    let response = cookie_client.get::<()>(URL).await;
+    assert_snapshot!(response.status(), @"400 Bad Request");
+    assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"Must specify either `crate` or `user_id` query parameter"}]}"#);
+
+    Ok(())
+}
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__crate_with_no_configs-2.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__crate_with_no_configs-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__happy_path-2.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__happy_path-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__happy_path-4.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__happy_path-4.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__legacy_token_auth-2.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__legacy_token_auth-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-2.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-4.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-4.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-6.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-6.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-8.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__pagination-8.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__token_auth_with_trusted_publishing_scope-2.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__token_auth_with_trusted_publishing_scope-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__token_auth_with_wildcard_crate_scope-2.snap b/src/tests/routes/trustpub/github_configs/list/snapshots/integration__routes__trustpub__github_configs__list__by_crate__token_auth_with_wildcard_crate_scope-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/github_configs/list.rs
+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs b/src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
@@ -1,3 +1,4 @@
+use super::URL;
 use crate::builders::CrateBuilder;
 use crate::util::{RequestHelper, TestApp};
 use crates_io_database::models::token::{CrateScope, EndpointScope};
@@ -7,8 +8,6 @@ use diesel_async::AsyncPgConnection;
 use insta::{assert_json_snapshot, assert_snapshot};
 use serde_json::json;
 
-const URL: &str = "/api/v1/trusted_publishing/gitlab_configs";
-
 async fn create_config(
     conn: &mut AsyncPgConnection,
     crate_id: i32,
@@ -122,17 +121,6 @@ async fn test_crate_not_found() -> anyhow::Result<()> {
     Ok(())
 }
 
-#[tokio::test(flavor = "multi_thread")]
-async fn test_no_query_param() -> anyhow::Result<()> {
-    let (_, _, cookie_client) = TestApp::full().with_user().await;
-
-    let response = cookie_client.get::<()>(URL).await;
-    assert_snapshot!(response.status(), @"400 Bad Request");
-    assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"Failed to deserialize query string: missing field `crate`"}]}"#);
-
-    Ok(())
-}
-
 #[tokio::test(flavor = "multi_thread")]
 async fn test_crate_with_no_configs() -> anyhow::Result<()> {
     let (app, _, cookie_client) = TestApp::full().with_user().await;
@@ -284,7 +272,7 @@ async fn test_pagination() -> anyhow::Result<()> {
     let next_page = json["meta"]["next_page"]
         .as_str()
         .expect("next_page should be present");
-    let next_url = format!("{}{}", URL, next_page);
+    let next_url = format!("{URL}{next_page}");
     let response = cookie_client.get::<()>(&next_url).await;
     assert_snapshot!(response.status(), @"200 OK");
     let json = response.json();
@@ -296,7 +284,7 @@ async fn test_pagination() -> anyhow::Result<()> {
     let next_page = json["meta"]["next_page"]
         .as_str()
         .expect("next_page should be present");
-    let next_url = format!("{}{}", URL, next_page);
+    let next_url = format!("{URL}{next_page}");
     let response = cookie_client.get::<()>(&next_url).await;
     assert_snapshot!(response.status(), @"200 OK");
     let json = response.json();
@@ -310,7 +298,7 @@ async fn test_pagination() -> anyhow::Result<()> {
     let next_page = json["meta"]["next_page"]
         .as_str()
         .expect("next_page should be present on third page");
-    let next_url = format!("{}{}", URL, next_page);
+    let next_url = format!("{URL}{next_page}");
     let response = cookie_client.get::<()>(&next_url).await;
     assert_snapshot!(response.status(), @"200 OK");
     let json = response.json();
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/mod.rs b/src/tests/routes/trustpub/gitlab_configs/list/mod.rs
@@ -0,0 +1,17 @@
+use crate::util::{RequestHelper, TestApp};
+use insta::assert_snapshot;
+
+mod by_crate;
+
+pub const URL: &str = "/api/v1/trusted_publishing/gitlab_configs";
+
+#[tokio::test(flavor = "multi_thread")]
+async fn test_no_query_param() -> anyhow::Result<()> {
+    let (_, _, cookie_client) = TestApp::full().with_user().await;
+
+    let response = cookie_client.get::<()>(URL).await;
+    assert_snapshot!(response.status(), @"400 Bad Request");
+    assert_snapshot!(response.text(), @r#"{"errors":[{"detail":"Must specify either `crate` or `user_id` query parameter"}]}"#);
+
+    Ok(())
+}
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__crate_with_no_configs-2.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__crate_with_no_configs-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__happy_path-2.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__happy_path-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__happy_path-4.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__happy_path-4.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__legacy_token_auth-2.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__legacy_token_auth-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-2.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-4.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-4.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-6.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-6.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-8.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__pagination-8.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: json
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__token_auth_with_trusted_publishing_scope-2.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__token_auth_with_trusted_publishing_scope-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: response.json()
 ---
 {
diff --git a/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__token_auth_with_wildcard_crate_scope-2.snap b/src/tests/routes/trustpub/gitlab_configs/list/snapshots/integration__routes__trustpub__gitlab_configs__list__by_crate__token_auth_with_wildcard_crate_scope-2.snap
@@ -1,5 +1,5 @@
 ---
-source: src/tests/routes/trustpub/gitlab_configs/list.rs
+source: src/tests/routes/trustpub/gitlab_configs/list/by_crate.rs
 expression: response.json()
 ---
 {

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`---`
`2`		`-source: src/tests/routes/trustpub/github_configs/list.rs`
	`2`	`+source: src/tests/routes/trustpub/github_configs/list/by_crate.rs`
`3`	`3`	`expression: response.json()`
`4`	`4`	`---`
`5`	`5`	`{`