diff options
| author | Richard Mahn <richmahn@users.noreply.github.com> | 2019-06-29 11:19:24 -0400 |
|---|---|---|
| committer | zeripath <art27@cantab.net> | 2019-06-29 16:19:24 +0100 |
| commit | 002b597c1f87cd5c69d32053a62f57c08d48d3ee (patch) | |
| tree | c14ccd9f1a1b02e21759a4fcae569d8c8116df4f /integrations/api_repo_file_delete_test.go | |
| parent | 462284e2f5768cf04d71c7abd8c01eef20cff73d (diff) | |
| download | gitea-002b597c1f87cd5c69d32053a62f57c08d48d3ee.tar.gz gitea-002b597c1f87cd5c69d32053a62f57c08d48d3ee.zip | |
Fixes #7152 - Allow create/update/delete message to be empty, use default message (#7324)
* Fixes #7152 - Allow create/update/delete message to be empty, use default message
* Linting fix
* Fix to delete integration tests
Diffstat (limited to 'integrations/api_repo_file_delete_test.go')
| -rw-r--r-- | integrations/api_repo_file_delete_test.go | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/integrations/api_repo_file_delete_test.go b/integrations/api_repo_file_delete_test.go index 2f5f9028a8..59b3ff91b6 100644 --- a/integrations/api_repo_file_delete_test.go +++ b/integrations/api_repo_file_delete_test.go @@ -23,7 +23,7 @@ func getDeleteFileOptions() *api.DeleteFileOptions { FileOptions: api.FileOptions{ BranchName: "master", NewBranchName: "master", - Message: "Updates new/file.txt", + Message: "Removing the file new/file.txt", Author: api.Identity{ Name: "John Doe", Email: "johndoe@example.com", @@ -89,6 +89,20 @@ func TestAPIDeleteFile(t *testing.T) { DecodeJSON(t, resp, &fileResponse) assert.NotNil(t, fileResponse) assert.Nil(t, fileResponse.Content) + assert.EqualValues(t, deleteFileOptions.Message+"\n", fileResponse.Commit.Message) + + // Test deleting file without a message + fileID++ + treePath = fmt.Sprintf("delete/file%d.txt", fileID) + createFile(user2, repo1, treePath) + deleteFileOptions = getDeleteFileOptions() + deleteFileOptions.Message = "" + url = fmt.Sprintf("/api/v1/repos/%s/%s/contents/%s?token=%s", user2.Name, repo1.Name, treePath, token2) + req = NewRequestWithJSON(t, "DELETE", url, &deleteFileOptions) + resp = session.MakeRequest(t, req, http.StatusOK) + DecodeJSON(t, resp, &fileResponse) + expectedMessage := "Delete '" + treePath + "'\n" + assert.EqualValues(t, expectedMessage, fileResponse.Commit.Message) // Test deleting a file with the wrong SHA fileID++ |