refactor: [#109] extract structs and functions

josecelano · josecelano · commit 652f50b41bee · 2023-04-21T13:42:48.000+01:00
diff --git a/tests/e2e/asserts.rs b/tests/e2e/asserts.rs
@@ -9,7 +9,12 @@ pub fn assert_response_title(response: &Response, title: &str) {
     );
 }
 
-pub fn assert_ok(response: &Response) {
+pub fn assert_text_ok(response: &Response) {
     assert_eq!(response.status, 200);
     assert_eq!(response.content_type, "text/html; charset=utf-8");
 }
+
+pub fn assert_json_ok(response: &Response) {
+    assert_eq!(response.status, 200);
+    assert_eq!(response.content_type, "application/json");
+}
diff --git a/tests/e2e/client.rs b/tests/e2e/client.rs
@@ -18,6 +18,18 @@ impl Client {
         }
     }
 
+    pub async fn root(&self) -> Response {
+        self.get("", Query::empty()).await
+    }
+
+    pub async fn about(&self) -> Response {
+        self.get("about", Query::empty()).await
+    }
+
+    pub async fn license(&self) -> Response {
+        self.get("about/license", Query::empty()).await
+    }
+
     pub async fn get(&self, path: &str, params: Query) -> Response {
         self.get_request_with_query(path, params).await
     }
diff --git a/tests/e2e/connection_info.rs b/tests/e2e/connection_info.rs
@@ -1,4 +1,4 @@
-pub fn connection_with_no_token(bind_address: &str) -> ConnectionInfo {
+pub fn anonymous_connection(bind_address: &str) -> ConnectionInfo {
     ConnectionInfo::anonymous(bind_address)
 }
 
diff --git a/tests/e2e/env.rs b/tests/e2e/env.rs
@@ -0,0 +1,20 @@
+use crate::e2e::client::Client;
+use crate::e2e::connection_info::anonymous_connection;
+
+pub struct TestEnv {
+    pub authority: String,
+}
+
+impl TestEnv {
+    pub fn guess_client(&self) -> Client {
+        Client::new(anonymous_connection(&self.authority))
+    }
+}
+
+impl Default for TestEnv {
+    fn default() -> Self {
+        Self {
+            authority: "localhost:3000".to_string(),
+        }
+    }
+}
diff --git a/tests/e2e/mod.rs b/tests/e2e/mod.rs
@@ -19,6 +19,7 @@
 mod asserts;
 mod client;
 mod connection_info;
+pub mod env;
 mod http;
 mod response;
 mod routes;
diff --git a/tests/e2e/routes/about.rs b/tests/e2e/routes/about.rs
@@ -1,26 +1,24 @@
-use crate::e2e::asserts::{assert_ok, assert_response_title};
-use crate::e2e::client::Client;
-use crate::e2e::connection_info::connection_with_no_token;
-use crate::e2e::http::Query;
+use crate::e2e::asserts::{assert_response_title, assert_text_ok};
+use crate::e2e::env::TestEnv;
 
 #[tokio::test]
 #[cfg_attr(not(feature = "e2e-tests"), ignore)]
 async fn it_should_load_the_about_page_with_information_about_the_api() {
-    let client = Client::new(connection_with_no_token("localhost:3000"));
+    let client = TestEnv::default().guess_client();
 
-    let response = client.get("about", Query::empty()).await;
+    let response = client.about().await;
 
-    assert_ok(&response);
+    assert_text_ok(&response);
     assert_response_title(&response, "About");
 }
 
 #[tokio::test]
 #[cfg_attr(not(feature = "e2e-tests"), ignore)]
 async fn it_should_load_the_license_page_at_the_api_entrypoint() {
-    let client = Client::new(connection_with_no_token("localhost:3000"));
+    let client = TestEnv::default().guess_client();
 
-    let response = client.get("about/license", Query::empty()).await;
+    let response = client.license().await;
 
-    assert_ok(&response);
+    assert_text_ok(&response);
     assert_response_title(&response, "Licensing");
 }
diff --git a/tests/e2e/routes/mod.rs b/tests/e2e/routes/mod.rs
@@ -1,2 +1,3 @@
 pub mod about;
+
 pub mod root;
diff --git a/tests/e2e/routes/root.rs b/tests/e2e/routes/root.rs
@@ -1,15 +1,13 @@
-use crate::e2e::asserts::{assert_ok, assert_response_title};
-use crate::e2e::client::Client;
-use crate::e2e::connection_info::connection_with_no_token;
-use crate::e2e::http::Query;
+use crate::e2e::asserts::{assert_response_title, assert_text_ok};
+use crate::e2e::env::TestEnv;
 
 #[tokio::test]
 #[cfg_attr(not(feature = "e2e-tests"), ignore)]
 async fn it_should_load_the_about_page_at_the_api_entrypoint() {
-    let client = Client::new(connection_with_no_token("localhost:3000"));
+    let client = TestEnv::default().guess_client();
 
-    let response = client.get("", Query::empty()).await;
+    let response = client.root().await;
 
-    assert_ok(&response);
+    assert_text_ok(&response);
     assert_response_title(&response, "About");
 }

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,12 @@ pub fn assert_response_title(response: &Response, title: &str) {`
`9`	`9`	`);`
`10`	`10`	`}`
`11`	`11`
`12`		`-pub fn assert_ok(response: &Response) {`
	`12`	`+pub fn assert_text_ok(response: &Response) {`
`13`	`13`	`assert_eq!(response.status, 200);`
`14`	`14`	`assert_eq!(response.content_type, "text/html; charset=utf-8");`
`15`	`15`	`}`
	`16`	`+`
	`17`	`+pub fn assert_json_ok(response: &Response) {`
	`18`	`+ assert_eq!(response.status, 200);`
	`19`	`+ assert_eq!(response.content_type, "application/json");`
	`20`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,18 @@ impl Client {`
`18`	`18`	`}`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ pub async fn root(&self) -> Response {`
	`22`	`+ self.get("", Query::empty()).await`
	`23`	`+ }`
	`24`	`+`
	`25`	`+ pub async fn about(&self) -> Response {`
	`26`	`+ self.get("about", Query::empty()).await`
	`27`	`+ }`
	`28`	`+`
	`29`	`+ pub async fn license(&self) -> Response {`
	`30`	`+ self.get("about/license", Query::empty()).await`
	`31`	`+ }`
	`32`	`+`
`21`	`33`	`pub async fn get(&self, path: &str, params: Query) -> Response {`
`22`	`34`	`self.get_request_with_query(path, params).await`
`23`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-pub fn connection_with_no_token(bind_address: &str) -> ConnectionInfo {`
	`1`	`+pub fn anonymous_connection(bind_address: &str) -> ConnectionInfo {`
`2`	`2`	`ConnectionInfo::anonymous(bind_address)`
`3`	`3`	`}`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`pub mod about;`
	`2`	`+`
`2`	`3`	`pub mod root;`