fix webhook test #2415
Merged
fix webhook test #2415
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
|
LGTM |
tboerger
added
the
lgtm/need 1
ethantkoenig
suggested changes
Aug 28, 2017
models/webhook.go
Outdated
| @@ -482,6 +482,57 @@ func UpdateHookTask(t *HookTask) error { | |||
| return err | |||
| } | |||
|
|
|||
| // PrepareWebHook adds special webhook to task queue for given payload. | |||
| func PrepareWebHook(w *Webhook, repo *Repository, event HookEventType, p api.Payloader) error { | |||
There was a problem hiding this comment.
Could we call it PrepareWebhook for consistency?
There was a problem hiding this comment.
Since the function named PrepareWebHooks for fire all webhooks of a repository or an orgnization, I named this funtion PrepareWebHook for one webhook is reasonable.
There was a problem hiding this comment.
@lunny That function is named PrepareWebhooks, not PrepareWebHooks (https://github.com/go-gitea/gitea/blob/master/models/webhook.go#L486)
routers/repo/webhook.go
Outdated
| @@ -582,7 +590,7 @@ func TestWebhook(ctx *context.Context) { | |||
| Pusher: apiUser, | |||
| Sender: apiUser, | |||
| } | |||
| if err := models.PrepareWebhooks(ctx.Repo.Repository, models.HookEventPush, p); err != nil { | |||
| if err := models.PrepareWebHook(w, ctx.Repo.Repository, models.HookEventPush, p); err != nil { | |||
| ctx.Flash.Error("PrepareWebhooks: " + err.Error()) | |||
There was a problem hiding this comment.
Need to update error message
lunny
force-pushed
the
lunny/fix_webhook_test
branch
from
4438cef
to
e4c67e4
Compare
|
@ethantkoenig done and rebased. |
ethantkoenig
approved these changes
Aug 29, 2017
|
LGTM |
tboerger
added
lgtm/done
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
When click the test webhook, only this webhook should be fired but not all the webhooks of the repository.