From b3308d35260ae822249ce32f984d7e6d568cdf4a Mon Sep 17 00:00:00 2001 From: Neil Kakkar Date: Wed, 1 May 2024 17:37:10 +0100 Subject: [PATCH] rm old test --- feature-flags/src/v0_endpoint.rs | 2 +- feature-flags/src/v0_request.rs | 60 -------------------------------- 2 files changed, 1 insertion(+), 61 deletions(-) diff --git a/feature-flags/src/v0_endpoint.rs b/feature-flags/src/v0_endpoint.rs index 2d71e9e..a677278 100644 --- a/feature-flags/src/v0_endpoint.rs +++ b/feature-flags/src/v0_endpoint.rs @@ -53,7 +53,7 @@ pub async fn flags( tracing::Span::current().record("user_agent", user_agent); tracing::Span::current().record("content_encoding", content_encoding); - // tracing::Span::current().record("version", meta.lib_version.clone()); + tracing::Span::current().record("version", meta.version.clone()); tracing::Span::current().record("method", method.as_str()); tracing::Span::current().record("path", path.as_str().trim_end_matches('/')); diff --git a/feature-flags/src/v0_request.rs b/feature-flags/src/v0_request.rs index 36177a7..7a869d0 100644 --- a/feature-flags/src/v0_request.rs +++ b/feature-flags/src/v0_request.rs @@ -73,63 +73,3 @@ impl FlagRequest { Ok(token) } } - -#[cfg(test)] -mod tests { - use base64::Engine as _; - use bytes::Bytes; - use rand::distributions::Alphanumeric; - use rand::Rng; - use serde_json::json; - - use super::FlagError; - use super::FlagRequest; - - #[test] - fn extract_and_verify_token() { - let parse_and_extract = |input: &'static str| -> Result { - FlagRequest::from_bytes(input.into()) - .expect("failed to parse") - .extract_and_verify_token() - }; - - let assert_extracted_token = |input: &'static str, expected: &str| { - let id = parse_and_extract(input).expect("failed to extract"); - assert_eq!(id, expected); - }; - - // Return NoTokenError if not found - assert!(matches!( - parse_and_extract(r#"{"distinct_id": "xyz"}"#), - Err(FlagError::NoTokenError) - )); - - // Return TokenValidationError if token empty - assert!(matches!( - parse_and_extract(r#"{"api_key": "", "batch":[{"event": "e"}]}"#), - Err(FlagError::TokenValidationError) - )); - - // Return TokenValidationError if personal apikey - assert!(matches!( - parse_and_extract(r#"[{"event": "e", "token": "phx_hellothere"}]"#), - Ok(_) - )); - - // Return token from array if consistent - assert_extracted_token( - r#"[{"event":"e","token":"token1"},{"event":"e","token":"token1"}]"#, - "token1", - ); - - // Return token from batch if present - assert_extracted_token( - r#"{"batch":[{"event":"e","token":"token1"}],"api_key":"batched"}"#, - "batched", - ); - - // Return token from single event if present - assert_extracted_token(r#"{"event":"e","$token":"single_token"}"#, "single_token"); - assert_extracted_token(r#"{"event":"e","api_key":"single_token"}"#, "single_token"); - } -}