Reverted sandbox clientOptions changes, refactored opts param

ably · Aug 15, 2024 · d368039 · d368039
1 parent d240ee3
commit d368039
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/ablytest/sandbox.go b/ablytest/sandbox.go
@@ -231,6 +231,13 @@ func (app *Sandbox) Options(opts ...ably.ClientOption) []ably.ClientOption {
 		Hijack(http.RoundTripper) http.RoundTripper
 	}
 	appHTTPClient := NewHTTPClient()
+	appOpts := []ably.ClientOption{
+		ably.WithKey(app.Key()),
+		ably.WithEnvironment(app.Environment),
+		ably.WithUseBinaryProtocol(!NoBinaryProtocol),
+		ably.WithHTTPClient(appHTTPClient),
+		ably.WithLogLevel(DefaultLogLevel),
+	}
 
 	// If opts want to record round trips inject the recording transport
 	// via TransportHijacker interface.
@@ -240,13 +247,6 @@ func (app *Sandbox) Options(opts ...ably.ClientOption) []ably.ClientOption {
 			opts = append(opts, ably.WithHTTPClient(appHTTPClient))
 		}
 	}
-
-	appOpts := []ably.ClientOption{
-		ably.WithKey(app.Key()),
-		ably.WithEnvironment(app.Environment),
-		ably.WithUseBinaryProtocol(!NoBinaryProtocol),
-		ably.WithLogLevel(DefaultLogLevel),
-	}
 	appOpts = MergeOptions(appOpts, opts)
 
 	return appOpts