Fix tests

Author: eslutz

internal/qbit/client_test.go

@@ -5,7 +5,6 @@ import (
 	"net/http"
 	"net/http/cookiejar"
 	"net/http/httptest"
-	"strconv"
 	"testing"
 )
 
@@ -162,11 +161,23 @@ func TestSetPort_Success(t *testing.T) {
 			if err != nil {
 				t.Fatalf("ParseForm error: %v", err)
 			}
-			portStr := r.Form.Get("listen_port")
-			var err2 error
-			receivedPort, err2 = strconv.Atoi(portStr)
-			if err2 != nil {
-				t.Fatalf("Atoi error: %v", err2)
+			// qBittorrent API expects the preferences as JSON in the 'json' form field
+			jsonStr := r.Form.Get("json")
+			if jsonStr == "" {
+				w.WriteHeader(http.StatusBadRequest)
+				_, _ = w.Write([]byte("json parameter missing"))
+				return
+			}
+			var prefs map[string]int
+			if err := json.Unmarshal([]byte(jsonStr), &prefs); err != nil {
+				t.Fatalf("json.Unmarshal error: %v", err)
+			}
+			var ok bool
+			receivedPort, ok = prefs["listen_port"]
+			if !ok {
+				w.WriteHeader(http.StatusBadRequest)
+				_, _ = w.Write([]byte("listen_port parameter missing"))
+				return
 			}
 			w.WriteHeader(http.StatusOK)
 			return

internal/sync/watcher_test.go

@@ -6,7 +6,6 @@ import (
 	"net/http/httptest"
 	"os"
 	"path/filepath"
-	"strconv"
 	"testing"
 
 	"github.com/eslutz/forwardarr/internal/qbit"
@@ -36,17 +35,19 @@ func TestReadPortFromFile_Success(t *testing.T) {
 func newTestQbitServer(t *testing.T, initialPort int, getStatus, setStatus int) (*httptest.Server, *int, *int, *int) {
 	t.Helper()
 
-	port := initialPort
-	setPortCalls := 0
-	getPortCalls := 0
+	// Use heap-allocated variables so pointers remain valid
+	port := new(int)
+	*port = initialPort
+	setPortCalls := new(int)
+	getPortCalls := new(int)
 
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		switch r.URL.Path {
 		case "/api/v2/auth/login":
 			w.WriteHeader(http.StatusOK)
 			_, _ = w.Write([]byte("Ok."))
 		case "/api/v2/app/preferences":
-			getPortCalls++
+			*getPortCalls++
 			status := http.StatusOK
 			if getStatus != 0 {
 				status = getStatus
@@ -58,9 +59,9 @@ func newTestQbitServer(t *testing.T, initialPort int, getStatus, setStatus int)
 			}
 
 			w.Header().Set("Content-Type", "application/json")
-			_ = json.NewEncoder(w).Encode(qbit.Preferences{ListenPort: port})
+			_ = json.NewEncoder(w).Encode(qbit.Preferences{ListenPort: *port})
 		case "/api/v2/app/setPreferences":
-			setPortCalls++
+			*setPortCalls++
 			status := http.StatusOK
 			if setStatus != 0 {
 				status = setStatus
@@ -77,10 +78,15 @@ func newTestQbitServer(t *testing.T, initialPort int, getStatus, setStatus int)
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
-			portStr := r.Form.Get("listen_port")
-			if portStr != "" {
-				if p, err := strconv.Atoi(portStr); err == nil {
-					port = p
+
+			// qBittorrent API expects the preferences as JSON in the 'json' form field
+			jsonStr := r.Form.Get("json")
+			if jsonStr != "" {
+				var prefs map[string]int
+				if err := json.Unmarshal([]byte(jsonStr), &prefs); err != nil {
+					t.Errorf("json.Unmarshal error: %v", err)
+				} else if newPort, ok := prefs["listen_port"]; ok {
+					*port = newPort
 				}
 			}
 			w.WriteHeader(http.StatusOK)
@@ -89,7 +95,7 @@ func newTestQbitServer(t *testing.T, initialPort int, getStatus, setStatus int)
 		}
 	}))
 
-	return server, &port, &getPortCalls, &setPortCalls
+	return server, port, getPortCalls, setPortCalls
 }
 
 func TestWatcherSyncPortUpdatesPort(t *testing.T) {