Update error handling in DoJSON #722
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sebasslash
previously approved these changes
Jun 16, 2023
|
@sebasslash I added some unit tests |
sebasslash
approved these changes
Jun 20, 2023
Comment on lines
+36
to
+63
| testServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { | ||
| fakeBody := map[string]any{ | ||
| "id": "example", | ||
| "name": "fixture", | ||
| "method": r.Method, | ||
| } | ||
| fakeBodyRaw, err := json.Marshal(fakeBody) | ||
| require.NoError(t, err) | ||
|
|
||
| if strings.HasSuffix(r.URL.String(), "/ok_request") { | ||
| w.Header().Set("content-type", "application/json") | ||
| w.Header().Set("content-length", strconv.FormatInt(int64(len(fakeBodyRaw)), 10)) | ||
| w.WriteHeader(http.StatusOK) | ||
| _, err = w.Write(fakeBodyRaw) | ||
| require.NoError(t, err) | ||
| } else if strings.HasSuffix(r.URL.String(), "/bad_request") { | ||
| w.WriteHeader(http.StatusBadRequest) | ||
| } else if strings.HasSuffix(r.URL.String(), "/created_request") { | ||
| w.WriteHeader(http.StatusCreated) | ||
| } else if strings.HasSuffix(r.URL.String(), "/not_modified_request") { | ||
| w.WriteHeader(http.StatusNotModified) | ||
| } else { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| } | ||
| })) | ||
| t.Cleanup(func() { | ||
| testServer.Close() | ||
| }) |
There was a problem hiding this comment.
💅 Worth defining this as a helper in helper_test.go?
Comment on lines
+45
to
+59
| if strings.HasSuffix(r.URL.String(), "/ok_request") { | ||
| w.Header().Set("content-type", "application/json") | ||
| w.Header().Set("content-length", strconv.FormatInt(int64(len(fakeBodyRaw)), 10)) | ||
| w.WriteHeader(http.StatusOK) | ||
| _, err = w.Write(fakeBodyRaw) | ||
| require.NoError(t, err) | ||
| } else if strings.HasSuffix(r.URL.String(), "/bad_request") { | ||
| w.WriteHeader(http.StatusBadRequest) | ||
| } else if strings.HasSuffix(r.URL.String(), "/created_request") { | ||
| w.WriteHeader(http.StatusCreated) | ||
| } else if strings.HasSuffix(r.URL.String(), "/not_modified_request") { | ||
| w.WriteHeader(http.StatusNotModified) | ||
| } else { | ||
| w.WriteHeader(http.StatusNotFound) | ||
| } |
There was a problem hiding this comment.
💅 A switch/case may be cleaner given the longer if/else chain:
paths := strings.Split(r.URL.Path, "/")
switch paths[len(paths) - 1] {
case "ok_request":
...
}
|
Reminder to the contributor that merged this PR: if your changes have added important functionality or fixed a relevant bug, open a follow-up PR to update CHANGELOG.md with a note on your changes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This was part of a new method in #717 -- when an error occurs, the resp.Body is nil so we need to wait until after checking
err != nil