Reorganize test modules

src/domain/subscriber_email.rs

@@ -24,8 +24,8 @@ impl AsRef<str> for SubscriberEmail {
 mod tests {
     use super::SubscriberEmail;
     use claims::{assert_err, assert_ok};
+    use helpers::valid_emails;
     use proptest::prelude::proptest;
-    use valid_emails::valid_emails;
 
     proptest! {
         #[test]
@@ -74,7 +74,7 @@ mod tests {
         assert_err!(result);
     }
 
-    mod valid_emails {
+    mod helpers {
         use fake::{
             faker::internet::en::{FreeEmail, SafeEmail},
             Fake,

src/domain/subscriber_name.rs

@@ -34,11 +34,10 @@ impl AsRef<str> for SubscriberName {
 
 #[cfg(test)]
 mod tests {
+    use super::FORBIDDEN_CHARS;
     use crate::domain::SubscriberName;
     use claims::{assert_err, assert_ok};
 
-    use super::FORBIDDEN_CHARS;
-
     #[test]
     fn a_valid_name_is_parsed_successfully() {
         // given

src/email_client.rs

@@ -73,9 +73,8 @@ struct SendEmailRequest<'a> {
 #[cfg(test)]
 mod tests {
     use claims::{assert_err, assert_ok};
-    use matcher::SendEmailBodyMatcher;
+    use helpers::{content, email, email_client, subject, SendEmailBodyMatcher};
     use std::time::Duration;
-    use util::*;
     use wiremock::{
         matchers::{any, header, header_exists, method, path},
         Mock, MockServer, ResponseTemplate,
@@ -148,8 +147,18 @@ mod tests {
         assert_err!(response);
     }
 
-    mod matcher {
+    mod helpers {
+        use crate::{domain::SubscriberEmail, email_client::EmailClient};
+        use fake::{
+            faker::{
+                internet::en::SafeEmail,
+                lorem::en::{Paragraph, Sentence},
+            },
+            Fake, Faker,
+        };
+        use secrecy::Secret;
         use serde_json::{from_slice, Value};
+        use std::time::Duration;
         use wiremock::{Match, Request};
 
         pub struct SendEmailBodyMatcher;
@@ -167,19 +176,6 @@ mod tests {
                 }
             }
         }
-    }
-
-    mod util {
-        use crate::{domain::SubscriberEmail, email_client::EmailClient};
-        use fake::{
-            faker::{
-                internet::en::SafeEmail,
-                lorem::en::{Paragraph, Sentence},
-            },
-            Fake, Faker,
-        };
-        use secrecy::Secret;
-        use std::time::Duration;
 
         pub fn email_client(base_url: String) -> EmailClient {
             EmailClient::new(

tests/health_check.rs → tests/api/health_check.rs

@@ -1,11 +1,11 @@
-mod util;
+use crate::helpers::{spawn_app, url};
 
 #[tokio::test]
 async fn health_check_works() {
     // given
     let client = reqwest::Client::new();
-    let app = util::spawn_app().await;
-    let url = util::url(app.address, "health_check");
+    let app = spawn_app().await;
+    let url = url(app.address, "health_check");
 
     // when
     let response = client

tests/api/main.rs

@@ -0,0 +1,3 @@
+mod health_check;
+mod helpers;
+mod subscriptions;

tests/subscriptions.rs → tests/api/subscriptions.rs

@@ -1,12 +1,12 @@
-mod util;
+use crate::helpers::{spawn_app, url};
 
 #[tokio::test]
 async fn subscribe_returns_a_200_for_valid_form_data() {
     // given
     let client = reqwest::Client::new();
     let body = "name=Imi%C4%99%20Nazwisko&email=imie.nazwisko%40example.com";
-    let app = util::spawn_app().await;
-    let url = util::url(app.address, "subscriptions");
+    let app = spawn_app().await;
+    let url = url(app.address, "subscriptions");
 
     // when
     let response = client
@@ -31,8 +31,8 @@ async fn subscribe_returns_a_200_for_valid_form_data() {
 async fn subscribe_returns_a_400_when_fields_are_present_but_empty() {
     // given
     let client = reqwest::Client::new();
-    let app = util::spawn_app().await;
-    let url = util::url(app.address, "subscriptions");
+    let app = spawn_app().await;
+    let url = url(app.address, "subscriptions");
     let test_cases = vec![
         ("name=Imi%C4%99%20Nazwisko&email=", "empty email"),
         (
@@ -67,8 +67,8 @@ async fn subscribe_returns_a_400_when_fields_are_present_but_empty() {
 async fn subscribe_returns_a_400_when_data_is_missing() {
     // given
     let client = reqwest::Client::new();
-    let app = util::spawn_app().await;
-    let url = util::url(app.address, "subscriptions");
+    let app = spawn_app().await;
+    let url = url(app.address, "subscriptions");
     let test_cases = vec![
         ("name=Imi%C4%99%20Nazwisko", "missing the email"),
         ("email=imie.nazwisko%40example.com", "missing the name"),