fix(tests): change route in tests to adapt to path extraction

Signed-off-by: simonsan <14062932+simonsan@users.noreply.github.com>

src/handlers/file_config.rs

@@ -112,7 +112,7 @@ mod test {
         // NOT CONFIG
         // -----------------------
         let app = Router::new()
-            .route("/:path/config", head(has_config))
+            .route("/:path/:tpe", head(has_config))
             .layer(middleware::from_fn(print_request_response));
 
         let request = Request::builder()
@@ -133,7 +133,7 @@ mod test {
         // HAS CONFIG
         // -----------------------
         let app = Router::new()
-            .route("/:path/config", head(has_config))
+            .route("/:path/:tpe", head(has_config))
             .layer(middleware::from_fn(print_request_response));
 
         let request = Request::builder()
@@ -179,7 +179,7 @@ mod test {
         // -----------------------
         let repo_name_uri = ["/", &repo, "?create=true"].concat();
         let app = Router::new()
-            .route("/:path/config", post(create_repository))
+            .route("/:path/:tpe", post(create_repository))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&repo_name_uri, Method::POST);
@@ -195,7 +195,7 @@ mod test {
         let body = Body::new(test_vec.clone());
 
         let app = Router::new()
-            .route("/:path/config", post(add_config))
+            .route("/:path/:tpe", post(add_config))
             .layer(middleware::from_fn(print_request_response));
 
         let request = Request::builder()
@@ -220,7 +220,7 @@ mod test {
         // GET CONFIG
         // -----------------------
         let app = Router::new()
-            .route("/:path/config", get(get_config))
+            .route("/:path/:tpe", get(get_config))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&uri, Method::GET);
@@ -237,7 +237,7 @@ mod test {
         // - differs from tester_has_config() that we have a non empty path now
         // -----------------------
         let app = Router::new()
-            .route("/:path/config", head(has_config))
+            .route("/:path/:tpe", head(has_config))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&uri, Method::HEAD);
@@ -249,7 +249,7 @@ mod test {
         // DELETE CONFIG
         // -----------------------
         let app = Router::new()
-            .route("/:path/config", delete(delete_config))
+            .route("/:path/:tpe", delete(delete_config))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&uri, Method::DELETE);
@@ -264,7 +264,7 @@ mod test {
         // -----------------------
         let repo_name_uri = ["/", &repo].concat();
         let app = Router::new()
-            .route("/:path/config", post(delete_repository))
+            .route("/:path/:tpe", post(delete_repository))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&repo_name_uri, Method::POST);

src/handlers/file_exchange.rs

@@ -218,7 +218,7 @@ mod test {
         // Write a complete file
         //----------------------------------------------
         let app = Router::new()
-            .route("/*path", put(add_file))
+            .route("/:path/:tpe/:name", put(add_file))
             .layer(middleware::from_fn(print_request_response));
 
         let test_vec = "Hello World".to_string();
@@ -246,7 +246,7 @@ mod test {
         // Delete a complete file
         //----------------------------------------------
         let app = Router::new()
-            .route("/*path", delete(delete_file))
+            .route("/:path/:tpe/:name", delete(delete_file))
             .layer(middleware::from_fn(print_request_response));
 
         let uri = ["/test_repo/keys/", file_name].concat();
@@ -294,7 +294,7 @@ mod test {
 
         // Start with creating the file before we can test
         let app = Router::new()
-            .route("/*path", put(add_file))
+            .route("/:path/:tpe/:name", put(add_file))
             .layer(middleware::from_fn(print_request_response));
 
         let test_vec = "Hello Sweet World".to_string();
@@ -322,7 +322,7 @@ mod test {
         // Fetch the complete file
         //----------------------------------------
         let app = Router::new()
-            .route("/*path", get(get_file))
+            .route("/:path/:tpe/:name", get(get_file))
             .layer(middleware::from_fn(print_request_response));
 
         let uri = ["/test_repo/keys/", file_name].concat();
@@ -365,10 +365,8 @@ mod test {
         //----------------------------------------------
         // Clean up -> Delete test file
         //----------------------------------------------
-        // fs::remove_file(&path).unwrap();
-        // assert!( !path.exists() );
         let app = Router::new()
-            .route("/*path", delete(delete_file))
+            .route("/:path/:tpe/:name", delete(delete_file))
             .layer(middleware::from_fn(print_request_response));
 
         let uri = ["/test_repo/keys/", file_name].concat();
@@ -395,7 +393,7 @@ mod test {
         let test_vec = fs::read(path).unwrap();
 
         let app = Router::new()
-            .route("/*path", get(get_file))
+            .route("/:path/:tpe/:name", get(get_file))
             .layer(middleware::from_fn(print_request_response));
 
         let uri = "/test_repo/config";

src/handlers/file_length.rs

@@ -68,7 +68,7 @@ mod test {
         // File exists
         // ----------------------------------
         let app = Router::new()
-            .route("/*path", head(file_length))
+            .route("/:path/:tpe/:name", head(file_length))
             .layer(middleware::from_fn(print_request_response));
 
         let uri =
@@ -100,7 +100,7 @@ mod test {
         // File does NOT exist
         // ----------------------------------
         let app = Router::new()
-            .route("/*path", head(file_length))
+            .route("/:path/:tpe/:name", head(file_length))
             .layer(middleware::from_fn(print_request_response));
 
         let uri = "/test_repo/keys/__I_do_not_exist__";

src/handlers/repository.rs

@@ -128,7 +128,7 @@ mod test {
         // ------------------------------------
         let repo_name_uri = "/repo_remove_me?create=true".to_string();
         let app = Router::new()
-            .route("/*path", post(create_repository))
+            .route("/:path/:tpe", post(create_repository))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&repo_name_uri, Method::POST);
@@ -142,7 +142,7 @@ mod test {
         // ------------------------------------------
         let repo_name_uri = "/repo_not_allowed?create=true".to_string();
         let app = Router::new()
-            .route("/*path", post(create_repository))
+            .route("/:path/:tpe", post(create_repository))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&repo_name_uri, Method::POST);
@@ -156,7 +156,7 @@ mod test {
         // ------------------------------------------
         let repo_name_uri = "/repo_remove_me?create=true".to_string();
         let app = Router::new()
-            .route("/*path", post(delete_repository))
+            .route("/:path", post(delete_repository))
             .layer(middleware::from_fn(print_request_response));
 
         let request = Request::builder()
@@ -180,7 +180,7 @@ mod test {
         assert!(path.exists()); // pre condition: repo exists
         let repo_name_uri = "/repo_remove_me".to_string();
         let app = Router::new()
-            .route("/*path", delete(delete_repository))
+            .route("/:path", delete(delete_repository))
             .layer(middleware::from_fn(print_request_response));
 
         let request = request_uri_for_test(&repo_name_uri, Method::DELETE);