fix tests after merge train (#686)

getkin · Nov 29, 2022 · 834a791 · 834a791
1 parent c793660
commit 834a791
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/openapi3filter/issue641_test.go b/openapi3filter/issue641_test.go
@@ -69,7 +69,7 @@ paths:
 			name:   "failed allof pattern",
 			spec:   allOfSpec,
 			req:    `/items?test=999999`,
-			errStr: `parameter "test" in query has an error: string doesn't match the regular expression`,
+			errStr: `parameter "test" in query has an error: string "999999" doesn't match the regular expression "^[0-9]{1,4}$"`,
 		},
 	}
 

diff --git a/openapi3filter/options_test.go b/openapi3filter/options_test.go
@@ -41,8 +41,7 @@ paths:
 		panic(err)
 	}
 
-	err = doc.Validate(loader.Context)
-	if err != nil {
+	if err = doc.Validate(loader.Context); err != nil {
 		panic(err)
 	}
 

diff --git a/openapi3filter/req_resp_decoder.go b/openapi3filter/req_resp_decoder.go
@@ -579,8 +579,7 @@ func (d *urlValuesDecoder) parseValue(v string, schema *openapi3.SchemaRef) (int
 		var value interface{}
 		var err error
 		for _, sr := range schema.Value.AnyOf {
-			value, err = d.parseValue(v, sr)
-			if err == nil {
+			if value, err = d.parseValue(v, sr); err == nil {
 				return value, nil
 			}
 		}