diff --git a/tests/api/helpers.rs b/tests/api/helpers.rs index 1870c57..ab942e0 100644 --- a/tests/api/helpers.rs +++ b/tests/api/helpers.rs @@ -21,6 +21,12 @@ pub struct TestApp { pub email_server: MockServer, } +/// Confirmation links embedded in the request to the email API. +pub struct ConfirmationLinks { + pub html: reqwest::Url, + pub plain_text: reqwest::Url +} + impl TestApp { pub async fn post_subscriptions(&self, body: String) -> reqwest::Response { reqwest::Client::new() @@ -31,6 +37,33 @@ impl TestApp { .await .expect("Failed to execute request.") } + + /// Extract the confirmation links embedded in the request to the email API. + pub fn get_confirmation_links(&self, email_request: &wiremock::Request) -> ConfirmationLinks { + let body: serde_json::Value = serde_json::from_slice(&email_request.body).unwrap(); + + // Extract the link from one of the request fields. + let get_link = |s: &str| { + let links: Vec<_> = linkify::LinkFinder::new() + .links(s) + .filter(|l| *l.kind() == linkify::LinkKind::Url) + .collect(); + assert_eq!(links.len(), 1); + let raw_link = links[0].as_str().to_owned(); + let mut confirmation_link = reqwest::Url::parse(&raw_link).unwrap(); + // Let's make sure we don't call random APIs on the web + assert_eq!(confirmation_link.host_str().unwrap(), "127.0.0.1"); + confirmation_link.set_port(Some(self.port)).unwrap(); + confirmation_link + }; + + let html = get_link(&body["HtmlBody"].as_str().unwrap()); + let plain_text = get_link(&body["TextBody"].as_str().unwrap()); + ConfirmationLinks { + html, + plain_text + } + } } pub async fn spawn_app() -> TestApp { diff --git a/tests/api/subscriptions.rs b/tests/api/subscriptions.rs index 24e0796..c097ff1 100644 --- a/tests/api/subscriptions.rs +++ b/tests/api/subscriptions.rs @@ -72,22 +72,10 @@ async fn subscribe_sends_a_confirmation_email_with_a_link() { // Assert let email_request = &app.email_server.received_requests().await.unwrap()[0]; - let body: serde_json::Value = serde_json::from_slice(&email_request.body).unwrap(); + let confirmation_links = app.get_confirmation_links(&email_request); - // Extract the link from one of the request fields. - let get_link = |s: &str| { - let links: Vec<_> = linkify::LinkFinder::new() - .links(s) - .filter(|l| *l.kind() == linkify::LinkKind::Url) - .collect(); - assert_eq!(links.len(), 1); - links[0].as_str().to_owned() - }; - - let html_link = get_link(&body["HtmlBody"].as_str().unwrap()); - let text_link = get_link(&body["TextBody"].as_str().unwrap()); // The two links should be identical - assert_eq!(html_link, text_link); + assert_eq!(confirmation_links.html, confirmation_links.plain_text); } #[actix_rt::test] diff --git a/tests/api/subscriptions_confirm.rs b/tests/api/subscriptions_confirm.rs index 4b2a01b..44b964a 100644 --- a/tests/api/subscriptions_confirm.rs +++ b/tests/api/subscriptions_confirm.rs @@ -1,5 +1,4 @@ use crate::helpers::spawn_app; -use reqwest::Url; use wiremock::{ResponseTemplate, Mock}; use wiremock::matchers::{path, method}; @@ -31,24 +30,10 @@ async fn the_link_returned_by_subscribe_returns_a_200_if_called() { app.post_subscriptions(body.into()).await; let email_request = &app.email_server.received_requests().await.unwrap()[0]; - let body: serde_json::Value = serde_json::from_slice(&email_request.body).unwrap(); - - // Extract the link from one of the request fields. - let get_link = |s: &str| { - let links: Vec<_> = linkify::LinkFinder::new() - .links(s) - .filter(|l| *l.kind() == linkify::LinkKind::Url) - .collect(); - assert_eq!(links.len(), 1); - links[0].as_str().to_owned() - }; - let mut confirmation_link = Url::parse(&get_link(&body["HtmlBody"].as_str().unwrap())).unwrap(); - // Let's make sure we don't call random APIs on the web - assert_eq!(confirmation_link.host_str().unwrap(), "127.0.0.1"); - confirmation_link.set_port(Some(app.port)).unwrap(); + let confirmation_links = app.get_confirmation_links(&email_request); // Act - let response = reqwest::get(confirmation_link) + let response = reqwest::get(confirmation_links.html) .await .unwrap();