This repository was archived by the owner on May 30, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 15
Fix to handle the error that the webhook is not found when an user deactivates #254
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| package interactor | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/golang/mock/gomock" | ||
|
|
||
| "github.com/gitploy-io/gitploy/ent" | ||
| "github.com/gitploy-io/gitploy/internal/interactor/mock" | ||
| "github.com/gitploy-io/gitploy/pkg/e" | ||
| ) | ||
|
|
||
| func TestInteractor_DeactivateRepo(t *testing.T) { | ||
| t.Run("Deactivate successfully even if the webhook is not found.", func(t *testing.T) { | ||
| ctrl := gomock.NewController(t) | ||
| store := mock.NewMockStore(ctrl) | ||
| scm := mock.NewMockSCM(ctrl) | ||
|
|
||
| t.Log("Mocking DeleteWebhook to return an EntityNotFound error.") | ||
| scm. | ||
| EXPECT(). | ||
| DeleteWebhook(gomock.Any(), gomock.AssignableToTypeOf(&ent.User{}), gomock.AssignableToTypeOf(&ent.Repo{}), gomock.Any()). | ||
| Return(e.NewError(e.ErrorCodeEntityNotFound, nil)) | ||
|
|
||
| store. | ||
| EXPECT(). | ||
| Deactivate(gomock.Any(), gomock.AssignableToTypeOf(&ent.Repo{})). | ||
| Return(&ent.Repo{}, nil) | ||
|
|
||
| i := newMockInteractor(store, scm) | ||
|
|
||
| _, err := i.DeactivateRepo(context.Background(), &ent.User{}, &ent.Repo{}) | ||
| if err != nil { | ||
| t.Fatalf("DeactivateRepo returns an error: %v", err) | ||
| } | ||
| }) | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| package github | ||
|
|
||
| import ( | ||
| "context" | ||
| "testing" | ||
|
|
||
| "github.com/gitploy-io/gitploy/ent" | ||
| "github.com/gitploy-io/gitploy/pkg/e" | ||
| "gopkg.in/h2non/gock.v1" | ||
| ) | ||
|
|
||
| func TestGithub_DeleteWebhook(t *testing.T) { | ||
| t.Run("Return the ErrorCodeEntityNotFound error when the webhook is not found.", func(t *testing.T) { | ||
| t.Log("Mocking the delete webhook API") | ||
| gock.New("https://api.github.com"). | ||
| Delete("/repos/gitploy-io/gitploy/hooks/1"). | ||
| Reply(404) | ||
|
|
||
| g := NewGithub(&GithubConfig{}) | ||
|
|
||
| const hookID = 1 | ||
|
|
||
| err := g.DeleteWebhook( | ||
| context.Background(), | ||
| &ent.User{}, | ||
| &ent.Repo{ | ||
| Namespace: "gitploy-io", | ||
| Name: "gitploy", | ||
| }, | ||
| hookID, | ||
| ) | ||
|
|
||
| if !e.HasErrorCode(err, e.ErrorCodeEntityNotFound) { | ||
| t.Fatalf("DeleteWebhook doesn't returns an ErrorCodeEntityNotFound error: %v", err) | ||
| } | ||
| }) | ||
|
|
||
| t.Run("Delete the webhook.", func(t *testing.T) { | ||
| t.Log("Mocking the delete webhook API") | ||
| gock.New("https://api.github.com"). | ||
| Delete("/repos/gitploy-io/gitploy/hooks/1"). | ||
| Reply(200) | ||
|
|
||
| g := NewGithub(&GithubConfig{}) | ||
|
|
||
| const hookID = 1 | ||
|
|
||
| err := g.DeleteWebhook( | ||
| context.Background(), | ||
| &ent.User{}, | ||
| &ent.Repo{ | ||
| Namespace: "gitploy-io", | ||
| Name: "gitploy", | ||
| }, | ||
| hookID, | ||
| ) | ||
|
|
||
| if err != nil { | ||
| t.Fatalf("DeleteWebhook returns an error: %v", err) | ||
| } | ||
| }) | ||
| } |
This file contains hidden or 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
This file contains hidden or 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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sort alphabetically