feat: support to get headers from binary request

LinuxSuRen · Nov 27, 2024 · a8d1370 · a8d1370
1 parent 0f02984
commit a8d1370
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/e2e/test-suite-common.yaml b/e2e/test-suite-common.yaml
@@ -163,6 +163,32 @@ items:
           }
         }
       }
+- name: createTestCaseForBinary
+  request:
+    api: /suites/{{.param.suiteName}}/cases
+    method: POST
+    header:
+      X-Store-Name: "{{.param.store}}"
+    body: |
+      {
+        "suiteName": "{{.param.suiteName}}",
+        "data": {
+          "name": "binary",
+          "request": {
+            "api": "{{.param.server}}/get",
+            "method": "GET"
+          }
+        }
+      }
+- name: runBinaryCase
+  request:
+    api: /suites/{{.param.suiteName}}/cases/binary/run
+    method: POST
+    header:
+      X-Store-Name: "{{.param.store}}"
+  expect:
+    header:
+      Content-Type: application/octet-stream
 - name: getTestCase
   request:
     api: /suites/{{.param.suiteName}}/cases/{{.param.caseName}}

diff --git a/pkg/runner/http.go b/pkg/runner/http.go
@@ -206,10 +206,11 @@ func (r *simpleTestCaseRunner) RunTestCase(testcase *testing.TestCase, dataConte
 
 	respType := util.GetFirstHeaderValue(resp.Header, util.ContentType)
 
+	r.withSimpleResponseRecord(resp)
 	if isNonBinaryContent(respType) {
 		var responseBodyData []byte
 		var rErr error
-		if responseBodyData, rErr = r.withResponseRecord(resp); rErr != nil {
+		if responseBodyData, rErr = r.withResponseBodyRecord(resp); rErr != nil {
 			err = errors.Join(err, rErr)
 			return
 		}
@@ -300,19 +301,23 @@ func generateRandomValue(param spec.Parameter) interface{} {
 	}
 }
 
-func (r *simpleTestCaseRunner) withResponseRecord(resp *http.Response) (responseBodyData []byte, err error) {
-	responseBodyData, err = io.ReadAll(resp.Body)
+func (r *simpleTestCaseRunner) withSimpleResponseRecord(resp *http.Response) {
 	r.simpleResponse = SimpleResponse{
 		StatusCode: resp.StatusCode,
 		Header:     make(map[string]string),
-		Body:       string(responseBodyData),
 	}
 
-	// add some headers for convienience
-	ammendHeaders(resp.Header, responseBodyData)
 	for key := range resp.Header {
 		r.simpleResponse.Header[key] = resp.Header.Get(key)
 	}
+}
+
+func (r *simpleTestCaseRunner) withResponseBodyRecord(resp *http.Response) (responseBodyData []byte, err error) {
+	responseBodyData, err = io.ReadAll(resp.Body)
+	r.simpleResponse.Body = string(responseBodyData)
+
+	// add some headers for convenience
+	ammendHeaders(resp.Header, responseBodyData)
 	return
 }
 

diff --git a/tools/make/run.mk b/tools/make/run.mk
@@ -13,7 +13,6 @@ run-server: ## Run the API Testing server
 run-server: build-ui run-backend
 run-backend:
 	go run . server --local-storage 'bin/*.yaml' --console-path ${ATEST_UI}/dist \
-		--mock-config bin/mock.yaml \
 		--extension-registry ghcr.io --download-timeout 90s
 
 .PHONY: run-console