Bookhoard/bookhoard
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 12 Wiki Activity

fix(tests): Fix helper function variable scope

Browse Source
This commit is contained in:
john-okeefe
2026-02-10 13:07:01 -05:00
parent fd4aa5cb59
commit 568e16eab4
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/server/tests/device_cap_test.go
+18 -18
View File
@@ -21,7 +21,7 @@ func TestUpdateUserMaxDevices(t *testing.T) {
// Create test user with admin role // Create test user with admin role
loginTestUser(t, setup.Server, setup.DB) loginTestUser(t, setup.Server, setup.DB)
adminUserID := getTestUserID(t, setup.DB) adminUserID := getTestUserID(t, setup.DB)
adminToken := getAdminToken(t, setup.Server, adminUserID) adminToken := getAdminToken(t, ts, adminUserID)
// Create a test user // Create a test user
userID := createTestUserForMaxDevices(t, setup.Server, adminToken) userID := createTestUserForMaxDevices(t, setup.Server, adminToken)
@@ -65,7 +65,7 @@ func TestUpdateUserMaxDevices(t *testing.T) {
} }
jsonData, _ := json.Marshal(payload) jsonData, _ := json.Marshal(payload)
req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+adminToken) req.Header.Set("Authorization", "Bearer "+adminToken)
@@ -92,7 +92,7 @@ func TestUpdateUserMaxDevicesValidation(t *testing.T) {
adminToken := loginTestUser(t, setup.Server, setup.DB) adminToken := loginTestUser(t, setup.Server, setup.DB)
createAdminUser(t, setup.Server, adminToken) createAdminUser(t, setup.Server, adminToken)
adminUserID := getTestUserID(t, setup.DB) adminUserID := getTestUserID(t, setup.DB)
adminToken = getAdminToken(t, setup.Server, adminUserID) adminToken = getAdminToken(t, ts, adminUserID)
// Create test user // Create test user
userID := createTestUserForMaxDevices(t, setup.Server, adminToken) userID := createTestUserForMaxDevices(t, setup.Server, adminToken)
@@ -131,7 +131,7 @@ func TestUpdateUserMaxDevicesValidation(t *testing.T) {
} }
jsonData, _ := json.Marshal(payload) jsonData, _ := json.Marshal(payload)
req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+adminToken) req.Header.Set("Authorization", "Bearer "+adminToken)
@@ -153,7 +153,7 @@ func TestUpdateUserMaxDevicesAuth(t *testing.T) {
adminToken := loginTestUser(t, setup.Server, setup.DB) adminToken := loginTestUser(t, setup.Server, setup.DB)
createAdminUser(t, setup.Server, adminToken) createAdminUser(t, setup.Server, adminToken)
adminUserID := getTestUserID(t, setup.DB) adminUserID := getTestUserID(t, setup.DB)
adminToken = getAdminToken(t, setup.Server, adminUserID) adminToken = getAdminToken(t, ts, adminUserID)
// Create regular user // Create regular user
userID := createTestUserForMaxDevices(t, setup.Server, adminToken) userID := createTestUserForMaxDevices(t, setup.Server, adminToken)
@@ -164,7 +164,7 @@ func TestUpdateUserMaxDevicesAuth(t *testing.T) {
} }
jsonData, _ := json.Marshal(payload) jsonData, _ := json.Marshal(payload)
req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
client := &http.Client{} client := &http.Client{}
@@ -187,7 +187,7 @@ func TestUpdateUserMaxDevicesAuth(t *testing.T) {
} }
jsonData, _ := json.Marshal(payload) jsonData, _ := json.Marshal(payload)
req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+userID.String()+"/max-devices", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+regularToken) req.Header.Set("Authorization", "Bearer "+regularToken)
@@ -208,7 +208,7 @@ func TestUpdateUserMaxDevicesNonExistentUser(t *testing.T) {
adminToken := loginTestUser(t, setup.Server, setup.DB) adminToken := loginTestUser(t, setup.Server, setup.DB)
createAdminUser(t, setup.Server, adminToken) createAdminUser(t, setup.Server, adminToken)
adminUserID := getTestUserID(t, setup.DB) adminUserID := getTestUserID(t, setup.DB)
adminToken = getAdminToken(t, setup.Server, adminUserID) adminToken = getAdminToken(t, ts, adminUserID)
// Use a non-existent user ID // Use a non-existent user ID
nonExistentUserID := uuid.New() nonExistentUserID := uuid.New()
@@ -218,7 +218,7 @@ func TestUpdateUserMaxDevicesNonExistentUser(t *testing.T) {
} }
jsonData, _ := json.Marshal(payload) jsonData, _ := json.Marshal(payload)
req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users/"+nonExistentUserID.String()+"/max-devices", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users/"+nonExistentUserID.String()+"/max-devices", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+adminToken) req.Header.Set("Authorization", "Bearer "+adminToken)
@@ -239,7 +239,7 @@ func TestUpdateUserMaxDevicesMissingUserID(t *testing.T) {
adminToken := loginTestUser(t, setup.Server, setup.DB) adminToken := loginTestUser(t, setup.Server, setup.DB)
createAdminUser(t, setup.Server, adminToken) createAdminUser(t, setup.Server, adminToken)
adminUserID := getTestUserID(t, setup.DB) adminUserID := getTestUserID(t, setup.DB)
adminToken = getAdminToken(t, setup.Server, adminUserID) adminToken = getAdminToken(t, ts, adminUserID)
payload := map[string]interface{}{ payload := map[string]interface{}{
"max_devices": 10, "max_devices": 10,
@@ -247,7 +247,7 @@ func TestUpdateUserMaxDevicesMissingUserID(t *testing.T) {
jsonData, _ := json.Marshal(payload) jsonData, _ := json.Marshal(payload)
// Missing user ID in URL // Missing user ID in URL
req, _ := http.NewRequest("PUT", setup.Server.URL+"/api/auth/users//max-devices", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("PUT", ts.URL+"/api/auth/users//max-devices", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+adminToken) req.Header.Set("Authorization", "Bearer "+adminToken)
@@ -267,9 +267,9 @@ func TestListUsersIncludesMaxDevices(t *testing.T) {
adminToken := loginTestUser(t, setup.Server, setup.DB) adminToken := loginTestUser(t, setup.Server, setup.DB)
createAdminUser(t, setup.Server, adminToken) createAdminUser(t, setup.Server, adminToken)
adminUserID := getTestUserID(t, setup.DB) adminUserID := getTestUserID(t, setup.DB)
adminToken = getAdminToken(t, setup.Server, adminUserID) adminToken = getAdminToken(t, ts, adminUserID)
req, _ := http.NewRequest("GET", setup.Server.URL+"/api/auth/users", nil) req, _ := http.NewRequest("GET", ts.URL+"/api/auth/users", nil)
req.Header.Set("Authorization", "Bearer "+adminToken) req.Header.Set("Authorization", "Bearer "+adminToken)
client := &http.Client{} client := &http.Client{}
@@ -304,7 +304,7 @@ func createAdminUser(t *testing.T, ts *httptest.Server, token string) {
} }
jsonData, _ := json.Marshal(createUserPayload) jsonData, _ := json.Marshal(createUserPayload)
req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/register", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("POST", ts.URL+"/api/auth/register", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+token) req.Header.Set("Authorization", "Bearer "+token)
@@ -324,7 +324,7 @@ func createTestUserForMaxDevices(t *testing.T, ts *httptest.Server, adminToken s
} }
jsonData, _ := json.Marshal(createUserPayload) jsonData, _ := json.Marshal(createUserPayload)
req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/register", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("POST", ts.URL+"/api/auth/register", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
req.Header.Set("Authorization", "Bearer "+adminToken) req.Header.Set("Authorization", "Bearer "+adminToken)
@@ -342,7 +342,7 @@ func createTestUserForMaxDevices(t *testing.T, ts *httptest.Server, adminToken s
"password": "Test@Pass123!", "password": "Test@Pass123!",
} }
loginData, _ := json.Marshal(loginPayload) loginData, _ := json.Marshal(loginPayload)
loginReq, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/login", bytes.NewBuffer(loginData)) loginReq, _ := http.NewRequest("POST", ts.URL+"/api/auth/login", bytes.NewBuffer(loginData))
loginReq.Header.Set("Content-Type", "application/json") loginReq.Header.Set("Content-Type", "application/json")
loginResp, err := client.Do(loginReq) loginResp, err := client.Do(loginReq)
@@ -420,7 +420,7 @@ func getAdminToken(t *testing.T, ts *httptest.Server, userID uuid.UUID) string {
} }
jsonData, _ := json.Marshal(loginPayload) jsonData, _ := json.Marshal(loginPayload)
req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/login", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("POST", ts.URL+"/api/auth/login", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
client := &http.Client{} client := &http.Client{}
@@ -448,7 +448,7 @@ func loginTestUserByCredentials(t *testing.T, ts *httptest.Server, email, passwo
} }
jsonData, _ := json.Marshal(loginPayload) jsonData, _ := json.Marshal(loginPayload)
req, _ := http.NewRequest("POST", setup.Server.URL+"/api/auth/login", bytes.NewBuffer(jsonData)) req, _ := http.NewRequest("POST", ts.URL+"/api/auth/login", bytes.NewBuffer(jsonData))
req.Header.Set("Content-Type", "application/json") req.Header.Set("Content-Type", "application/json")
client := &http.Client{} client := &http.Client{}
cmd/server/tests/queue_test.go
+1 -1
View File
@@ -19,7 +19,7 @@ import (
func TestListAllQueueItems_Admin(t *testing.T) { func TestListAllQueueItems_Admin(t *testing.T) {
setup := setupTestServer(t) setup := setupTestServer(t)
token := loginAdminUser(t, setup.Server, db) token := loginAdminUser(t, setup.Server, setup.DB) db)
req := httptest.NewRequest("GET", "/api/queue/items", nil) req := httptest.NewRequest("GET", "/api/queue/items", nil)
req.Header.Set("Authorization", "Bearer "+token) req.Header.Set("Authorization", "Bearer "+token)