Always parse JSON error, store it in BDD

Author: therve

.generator/templates/client.mustache

@@ -467,21 +467,18 @@ func (c *APIClient) decode(v interface{}, b []byte, contentType string) (err err
 		}
 		return nil
 	}
-	if jsonCheck.MatchString(contentType) {
-		if actualObj, ok := v.(interface{ GetActualInstance() interface{} }); ok { // oneOf, anyOf schemas
-			if unmarshalObj, ok := actualObj.(interface{ UnmarshalJSON([]byte) error }); ok { // make sure it has UnmarshalJSON defined
-				if err = unmarshalObj.UnmarshalJSON(b); err != nil {
-					return err
-				}
-			} else {
-				return errors.New("Unknown type with GetActualInstance but no unmarshalObj.UnmarshalJSON defined")
+	if actualObj, ok := v.(interface{ GetActualInstance() interface{} }); ok { // oneOf, anyOf schemas
+		if unmarshalObj, ok := actualObj.(interface{ UnmarshalJSON([]byte) error }); ok { // make sure it has UnmarshalJSON defined
+			if err = unmarshalObj.UnmarshalJSON(b); err != nil {
+				return err
 			}
-		} else if err = json.Unmarshal(b, v); err != nil { // simple model
-			return err
+		} else {
+			return errors.New("Unknown type with GetActualInstance but no unmarshalObj.UnmarshalJSON defined")
 		}
-		return nil
+	} else if err = json.Unmarshal(b, v); err != nil { // simple model
+		return err
 	}
-	return errors.New("undefined response type")
+	return nil
 }
 
 // Add a file to the multipart request

tests/scenarios/step_definitions.go

@@ -229,10 +229,26 @@ func requestIsSent(t gobdd.StepTest, ctx gobdd.Context) {
 		if code < 300 && err != nil {
 			t.Errorf("unexpected error: %v", err)
 		}
-		// Store the unmarshalled JSON in context
-		responseJSON, err := toJSON(result[0])
+		var responseJSON interface{}
 		if err != nil {
-			t.Errorf("Unable to decode response object to JSON: %v", err)
+			version := GetVersion(ctx)
+			if version == "v1" {
+				err := err.(v1.GenericOpenAPIError)
+				if newErr := json.Unmarshal(err.Body(), &responseJSON); newErr != nil {
+					t.Errorf("Unable to decode response object to JSON: %v", newErr)
+				}
+			} else {
+				err := err.(v2.GenericOpenAPIError)
+				if newErr := json.Unmarshal(err.Body(), &responseJSON); newErr != nil {
+					t.Errorf("Unable to decode response object to JSON: %v", newErr)
+				}
+			}
+		} else {
+			// Store the unmarshalled JSON in context
+			responseJSON, err = toJSON(result[0])
+			if err != nil {
+				t.Errorf("Unable to decode response object to JSON: %v", err)
+			}
 		}
 		ctx.Set(jsonResponseKey{}, responseJSON)
 	}