4 files changed, 11 insertions, 15 deletions

diff --git a/tests/authorization/cedar_authorizer_test.rs b/tests/authorization/cedar_authorizer_test.rs
index 656e0060..e7e6eb2c 100644
--- a/tests/authorization/cedar_authorizer_test.rs
+++ b/tests/authorization/cedar_authorizer_test.rs
@@ -7,7 +7,7 @@ mod tests {
 
     #[test]
     fn test_cedar_authorizer_allows_valid_token() {
-        let request = create_request(|item: &mut HttpRequest| {
+        let request = build_request(|item: &mut HttpRequest| {
             item.headers = build_with(|item: &mut HashMap<String, String>| {
                 item.insert(
                     String::from("authorization"),
@@ -21,7 +21,7 @@ mod tests {
 
     #[test]
     fn test_cedar_authorizer_denies_invalid_token() {
-        let request = create_request(|item: &mut HttpRequest| {
+        let request = build_request(|item: &mut HttpRequest| {
             item.headers = build_with(|item: &mut HashMap<String, String>| {
                 item.insert(
                     String::from("authorization"),
@@ -35,7 +35,7 @@ mod tests {
 
     #[test]
     fn test_cedar_authorizer_denies_missing_header() {
-        let request = create_request(|item: &mut HttpRequest| {
+        let request = build_request(|item: &mut HttpRequest| {
             item.headers = HashMap::new();
         });
 
@@ -44,7 +44,7 @@ mod tests {
 
     #[test]
     fn test_cedar_authorizer_allows_static_assets() {
-        let request = create_request(|item: &mut HttpRequest| {
+        let request = build_request(|item: &mut HttpRequest| {
             item.headers = build_with(|item: &mut HashMap<String, String>| {
                 item.insert(String::from(":path"), String::from("/public/style.css"));
             });
@@ -57,7 +57,7 @@ mod tests {
     fn test_cedar_authorizer_allows_js_assets() {
         let mut headers = HashMap::new();
         headers.insert(":path".to_string(), "/app.js".to_string());
-        let request = create_request(|item: &mut HttpRequest| {
+        let request = build_request(|item: &mut HttpRequest| {
             item.headers = headers;
         });
 
diff --git a/tests/authorization/check_service_test.rs b/tests/authorization/check_service_test.rs
index cddbb6b0..65b2d120 100644
--- a/tests/authorization/check_service_test.rs
+++ b/tests/authorization/check_service_test.rs
@@ -13,12 +13,12 @@ mod tests {
 
     #[tokio::test]
     async fn test_check_allows_valid_bearer_token() {
-        let token = create_token();
+        let token = String::from("valid-token");
         let server = CheckService::new(authorizer());
 
         let mut headers = HashMap::new();
         headers.insert("authorization".to_string(), format!("Bearer {}", token));
-        let request = tonic::Request::new(create_request(|item: &mut HttpRequest| {
+        let request = tonic::Request::new(build_request(|item: &mut HttpRequest| {
             item.headers = headers;
         }));
 
@@ -34,7 +34,7 @@ mod tests {
     #[tokio::test]
     async fn test_check_denies_invalid_bearer_token() {
         let server = CheckService::new(authorizer());
-        let request = tonic::Request::new(create_request(|item: &mut HttpRequest| {
+        let request = tonic::Request::new(build_request(|item: &mut HttpRequest| {
             item.headers = HashMap::new();
         }));
 
diff --git a/tests/common/factory_bot.rs b/tests/common/factory_bot.rs
index 6e45a01a..ea3a7da1 100644
--- a/tests/common/factory_bot.rs
+++ b/tests/common/factory_bot.rs
@@ -16,7 +16,7 @@ where
     return please::build_with(initializer);
 }
 
-pub fn create_request(f: impl std::ops::FnOnce(&mut HttpRequest)) -> CheckRequest {
+pub fn build_request(f: impl std::ops::FnOnce(&mut HttpRequest)) -> CheckRequest {
     crate::common::build_with(|item: &mut CheckRequest| {
         item.attributes = Some(please::build_with(|item: &mut AttributeContext| {
             item.request = Some(please::build_with(|item: &mut Request| {
@@ -34,10 +34,6 @@ pub fn build_headers(headers: Vec<(String, String)>) -> HashMap<String, String>
     });
 }
 
-pub fn create_token() -> String {
-    return String::from("valid-token");
-}
-
 pub fn build_cedar_authorizer() -> authzd::CedarAuthorizer {
     let realpath = std::fs::canonicalize("./etc/authzd").unwrap();
     let path = realpath.as_path();
diff --git a/tests/integration_tests.rs b/tests/integration_tests.rs
index 6e181f26..f7093600 100644
--- a/tests/integration_tests.rs
+++ b/tests/integration_tests.rs
@@ -14,7 +14,7 @@ fn authorizer() -> Arc<dyn authzd::Authorizer + Send + Sync> {
 #[tokio::test]
 async fn test_success_response() {
     let server = CheckService::new(authorizer());
-    let request = tonic::Request::new(factory_bot::create_request(|item: &mut HttpRequest| {
+    let request = tonic::Request::new(factory_bot::build_request(|item: &mut HttpRequest| {
         item.headers = factory_bot::build_headers(vec![(
             "authorization".to_string(),
             "Bearer valid-token".to_string(),
@@ -43,7 +43,7 @@ async fn test_multiple() {
     ];
 
     for (auth_value, should_succeed) in test_cases {
-        let request = tonic::Request::new(factory_bot::create_request(|item: &mut HttpRequest| {
+        let request = tonic::Request::new(factory_bot::build_request(|item: &mut HttpRequest| {
             item.headers = factory_bot::build_headers(vec![(
                 "authorization".to_string(),
                 auth_value.to_string(),