Fixed mosts tests

Forceu · Feb 2, 2025 · a7a31c3 · a7a31c3
1 parent 8ee4e74
commit a7a31c3
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/internal/test/TestHelper.go b/internal/test/TestHelper.go
@@ -415,6 +415,9 @@ func HttpPostRequest(t MockT, config HttpTestConfig) []*http.Cookie {
 		})
 	}
 	r.Header.Set("Content-type", "application/x-www-form-urlencoded")
+	for _, header := range config.Headers {
+		r.Header.Set(header.Name, header.Value)
+	}
 	client := &http.Client{}
 	response, err := client.Do(r)
 	IsNil(t, err)

diff --git a/internal/test/testconfiguration/TestConfiguration.go b/internal/test/testconfiguration/TestConfiguration.go
@@ -258,6 +258,13 @@ func writeApiKeys() {
 		UserId:       5,
 		PublicId:     "Queime3iun",
 	})
+	database.SaveApiKey(models.ApiKey{
+		Id:           "validkeyid7",
+		FriendlyName: "Key for uid 7",
+		Permissions:  models.ApiPermAll, // TODO
+		UserId:       7,
+		PublicId:     "Queime3iun7",
+	})
 	database.SaveApiKey(models.ApiKey{
 		Id:           "GAh1IhXDvYnqfYLazWBqMB9HSFmNPO",
 		FriendlyName: "Second Key",

diff --git a/internal/webserver/Webserver_test.go b/internal/webserver/Webserver_test.go
@@ -449,13 +449,6 @@ func TestPostUploadNoAuth(t *testing.T) {
 
 		RequiredContent: []string{"{\"Result\":\"error\",\"ErrorMessage\":\"Not authenticated\"}"},
 	})
-	test.HttpPostUploadRequest(t, test.HttpTestConfig{
-		Url:             "http://127.0.0.1:53843/uploadComplete",
-		UploadFileName:  "test/fileupload.jpg",
-		UploadFieldName: "file",
-		ResultCode:      http.StatusUnauthorized,
-		RequiredContent: []string{"{\"Result\":\"error\",\"ErrorMessage\":\"Not authenticated\"}"},
-	})
 }
 
 func TestPostUpload(t *testing.T) {
@@ -507,20 +500,14 @@ func TestPostUpload(t *testing.T) {
 	go func() {
 		time.Sleep(200 * time.Millisecond)
 		test.HttpPostRequest(t, test.HttpTestConfig{
-			Url: "http://127.0.0.1:53843/uploadComplete",
-			PostValues: []test.PostBody{{
-				Key:   "chunkid",
-				Value: "eeng4ier3Taen7a",
-			}, {
-				Key:   "filename",
-				Value: "fileupload.jpg",
-			}, {
-				Key:   "filecontenttype",
-				Value: "test-content",
-			}, {
-				Key:   "filesize",
-				Value: "50",
-			}},
+			Url: "http://127.0.0.1:53843/api/chunk/complete",
+			Headers: []test.Header{
+				{"apikey", "validkeyid7"},
+				{"uuid", "eeng4ier3Taen7a"},
+				{"filename", "fileupload.jpg"},
+				{"filecontenttype", "test-content"},
+				{"filesize", "50"},
+			},
 			RequiredContent: []string{"{\"result\":\"OK\"}"},
 			Cookies: []test.Cookie{{
 				Name:  "session_token",

diff --git a/internal/webserver/api/routings.go → internal/webserver/api/routing.go b/internal/webserver/api/routings.go → internal/webserver/api/routing.go