cleanup

rdcm · Nov 13, 2023 · 8b36ceb · 8b36ceb
1 parent 8161c4e
commit 8b36ceb
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 18 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ members = [
     "domain_impl",
     "host",
     "infra",
-    "integrtion-tests",
+    "integration-tests",
     "acl"
 ]
 

diff --git a/integrtion-tests/Cargo.toml → integration-tests/Cargo.toml b/integrtion-tests/Cargo.toml → integration-tests/Cargo.toml
diff --git a/integrtion-tests/tests/gen.rs → integration-tests/tests/gen.rs b/integrtion-tests/tests/gen.rs → integration-tests/tests/gen.rs
diff --git a/integrtion-tests/tests/sut.rs → integration-tests/tests/sut.rs b/integrtion-tests/tests/sut.rs → integration-tests/tests/sut.rs
@@ -44,12 +44,10 @@ impl Sut {
 
         let response = client.get(uri).send().await.unwrap();
 
-        if response.status() == StatusCode::OK {
-            let user: UserResponse = response.json().await.unwrap();
-
-            Ok(user)
-        } else {
-            Err(response.text().await.unwrap())
+        match response.status() {
+            StatusCode::OK => Ok(response.json().await.unwrap()),
+            StatusCode::BAD_REQUEST => Err(response.text().await.unwrap()),
+            code => Err(format!("unexpected status code {}", code))
         }
     }
 
@@ -68,12 +66,9 @@ impl Sut {
             .await
             .unwrap();
 
-        if response.status() == StatusCode::CREATED {
-            let user: CreatedUserIdResponse = response.json().await.unwrap();
-
-            Ok(user)
-        } else {
-            Err(response.text().await.unwrap())
+        match response.status() {
+            StatusCode::CREATED => Ok(response.json().await.unwrap()),
+            code => Err(format!("unexpected status code {}", code))
         }
     }
 
@@ -83,10 +78,9 @@ impl Sut {
 
         let response = client.post(uri).json(&activity).send().await.unwrap();
 
-        if response.status() == StatusCode::OK {
-            Ok(())
-        } else {
-            Err(response.text().await.unwrap())
+        match response.status() {
+            StatusCode::OK => Ok(()),
+            code => Err(format!("unexpected status code {}", code))
         }
     }
 

diff --git a/integrtion-tests/tests/user_tests.rs → integration-tests/tests/user_tests.rs b/integrtion-tests/tests/user_tests.rs → integration-tests/tests/user_tests.rs
diff --git a/run_tests.sh b/run_tests.sh
@@ -20,7 +20,7 @@ cargo test --workspace
 find . -path "*/${timestamp}/*" -name '*.profraw' -exec mv {} "./${directory_path}" \;
 
 # generate report
-grcov "${directory_path}" --binary-path target/debug -s . -o "${directory_path}" --ignore "target/debug/*" --ignore "integrtion-tests/*" --output-types html
+grcov "${directory_path}" --binary-path target/debug -s . -o "${directory_path}" --ignore "target/debug/*" --ignore "integration-tests/*" --output-types html
 
 # open report
 open "./${directory_path}/html/index.html"