From 1c5d7b51e4c857bac7cdf3cd3389bd4956ee7c31 Mon Sep 17 00:00:00 2001
From: Matt Palmer <mpalmer@hezmatt.org>
Date: Tue, 7 May 2024 18:59:44 +1000
Subject: [PATCH] Allow disabling redirect following in actix-test

If you're testing that redirects are being properly generated, then it's
useful to not have the client go off on a wild goose chase of its own.
---
 actix-test/CHANGES.md |  1 +
 actix-test/src/lib.rs | 21 ++++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/actix-test/CHANGES.md b/actix-test/CHANGES.md
index 082520447..c790b8fbf 100644
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@@ -3,6 +3,7 @@
 ## Unreleased
 
 - Minimum supported Rust version (MSRV) is now 1.72.
+- Add `TestServerConfig::disable_redirects()` method.
 
 ## 0.1.3
 
diff --git a/actix-test/src/lib.rs b/actix-test/src/lib.rs
index b7aeddad2..1a887d27b 100644
--- a/actix-test/src/lib.rs
+++ b/actix-test/src/lib.rs
@@ -147,6 +147,8 @@ where
         StreamType::Rustls022(_) => true,
     };
 
+    let client_cfg = cfg.clone();
+
     // run server in separate orphaned thread
     thread::spawn(move || {
         rt::System::new().block_on(async move {
@@ -416,7 +418,13 @@ where
             }
         };
 
-        Client::builder().connector(connector).finish()
+        let mut client_builder = Client::builder().connector(connector);
+
+        if client_cfg.disable_redirects {
+            client_builder = client_builder.disable_redirects();
+        }
+
+        client_builder.finish()
     };
 
     TestServer {
@@ -461,6 +469,7 @@ pub struct TestServerConfig {
     client_request_timeout: Duration,
     port: u16,
     workers: usize,
+    disable_redirects: bool,
 }
 
 impl Default for TestServerConfig {
@@ -478,6 +487,7 @@ impl TestServerConfig {
             client_request_timeout: Duration::from_secs(5),
             port: 0,
             workers: 1,
+            disable_redirects: false,
         }
     }
 
@@ -558,6 +568,15 @@ impl TestServerConfig {
         self.workers = workers;
         self
     }
+
+    /// Instruct the client to not follow redirects.
+    ///
+    /// By default, the client will follow up to 10 consecutive redirects
+    /// before giving up.
+    pub fn disable_redirects(mut self) -> Self {
+        self.disable_redirects = true;
+        self
+    }
 }
 
 /// A basic HTTP server controller that simplifies the process of writing integration tests for