Proof of concept #1

Merged
prskr merged 8 commits from feature/proof-of-concept into main 2023-03-10 10:17:07 +00:00
4 changed files with 156 additions and 6 deletions
Showing only changes of commit eee9a30503 - Show all commits

View file

@ -6,6 +6,7 @@ import (
giteaSdk "code.gitea.io/sdk/gitea" giteaSdk "code.gitea.io/sdk/gitea"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"golang.org/x/exp/slog"
"code.icb4dc0.de/prskr/nitter/nitters/gitea" "code.icb4dc0.de/prskr/nitter/nitters/gitea"
) )
@ -118,7 +119,7 @@ func runGiteaPRNitting(cmd *cobra.Command, args []string) error {
return err return err
} }
nitter := gitea.NewPRNitter(giteaClient, cfg) nitter := gitea.NewPRNitter(slog.Default(), giteaClient, cfg)
return nitter.Report(report, issues) return nitter.Report(report, issues)
} }
@ -156,7 +157,7 @@ func runGiteaPRLintNitting(cmd *cobra.Command, _ []string) error {
return err return err
} }
nitter := gitea.NewPRNitter(giteaClient, &cfg.GiteaPRConfig) nitter := gitea.NewPRNitter(slog.Default(), giteaClient, &cfg.GiteaPRConfig)
return nitter.Report(report, issues) return nitter.Report(report, issues)
} }

View file

@ -0,0 +1,29 @@
package logging
import (
"io"
"testing"
"golang.org/x/exp/slog"
)
var _ io.Writer = (*testWriter)(nil)
func NewWriter(tb testing.TB) io.Writer {
tb.Helper()
return testWriter{tb: tb}
}
func NewLogger(tb testing.TB) *slog.Logger {
tb.Helper()
return slog.New(slog.NewTextHandler(NewWriter(tb)))
}
type testWriter struct {
tb testing.TB
}
func (t testWriter) Write(p []byte) (n int, err error) {
t.tb.Log(string(p))
return len(p), nil
}

View file

@ -32,16 +32,23 @@ func init() {
} }
} }
func NewPRNitter(cli Client, cfg *GiteaPRConfig) *prNitter { func NewPRNitter(logger *slog.Logger, cli Client, cfg *GiteaPRConfig) *prNitter {
if logger == nil {
logger = slog.Default()
}
return &prNitter{ return &prNitter{
Client: cli, Client: cli,
logger: logger,
cfg: cfg, cfg: cfg,
} }
} }
type prNitter struct { type prNitter struct {
Client Client
cfg *GiteaPRConfig logger *slog.Logger
cfg *GiteaPRConfig
} }
func (p prNitter) Report(report *report.Data, issues []result.Issue) error { func (p prNitter) Report(report *report.Data, issues []result.Issue) error {

View file

@ -5,10 +5,11 @@ import (
"testing" "testing"
giteasdk "code.gitea.io/sdk/gitea" giteasdk "code.gitea.io/sdk/gitea"
"github.com/golangci/golangci-lint/pkg/report" "github.com/golangci/golangci-lint/pkg/report"
"github.com/golangci/golangci-lint/pkg/result"
"github.com/stretchr/testify/mock" "github.com/stretchr/testify/mock"
"code.icb4dc0.de/prskr/nitter/internal/logging"
"code.icb4dc0.de/prskr/nitter/nitters/gitea" "code.icb4dc0.de/prskr/nitter/nitters/gitea"
"code.icb4dc0.de/prskr/nitter/nitters/gitea/mocks" "code.icb4dc0.de/prskr/nitter/nitters/gitea/mocks"
) )
@ -40,7 +41,7 @@ func Test_PRNitter_Report_MockCreatorError_Error(t *testing.T) {
Return(nil, nil, nil). Return(nil, nil, nil).
Times(1) Times(1)
p := gitea.NewPRNitter(client, &gitea.GiteaPRConfig{}) p := gitea.NewPRNitter(logging.NewLogger(t), client, new(gitea.GiteaPRConfig))
if err := p.Report(new(report.Data), nil); err == nil { if err := p.Report(new(report.Data), nil); err == nil {
t.Error("expected error bot got none") t.Error("expected error bot got none")
@ -48,3 +49,115 @@ func Test_PRNitter_Report_MockCreatorError_Error(t *testing.T) {
t.Errorf("Error %v was not expected", err) t.Errorf("Error %v was not expected", err)
} }
} }
func Test_PRNitter_RequestChangesIfIssues_ReviewStateRequestChanges(t *testing.T) {
t.Parallel()
client := mocks.NewClient(t)
client.
EXPECT().
CreatePullReview(mock.Anything, mock.Anything, mock.Anything, expectReviewState(giteasdk.ReviewStateRequestChanges)).
Return(nil, nil, nil).
Times(1)
client.
EXPECT().
GetMyUserInfo().
Return(&giteasdk.User{ID: 11}, nil, nil).
Times(1)
client.
EXPECT().
GetPullRequest(mock.Anything, mock.Anything, mock.Anything).
Return(&giteasdk.PullRequest{Poster: &giteasdk.User{ID: 42}}, nil, nil)
client.
EXPECT().
ListPullReviews(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(nil, nil, nil).
Times(1)
p := gitea.NewPRNitter(logging.NewLogger(t), client, &gitea.GiteaPRConfig{ReviewState: giteasdk.ReviewStateRequestChanges})
if err := p.Report(new(report.Data), make([]result.Issue, 1)); err != nil {
t.Errorf("Did not expect error but got %v", err)
}
}
func Test_PRNitter_ApproveOthersPR_ReviewStateApproved(t *testing.T) {
t.Parallel()
client := mocks.NewClient(t)
client.
EXPECT().
CreatePullReview(mock.Anything, mock.Anything, mock.Anything, expectReviewState(giteasdk.ReviewStateApproved)).
Return(nil, nil, nil).
Times(1)
client.
EXPECT().
GetMyUserInfo().
Return(&giteasdk.User{ID: 11}, nil, nil).
Times(1)
client.
EXPECT().
GetPullRequest(mock.Anything, mock.Anything, mock.Anything).
Return(&giteasdk.PullRequest{Poster: &giteasdk.User{ID: 42}}, nil, nil)
client.
EXPECT().
ListPullReviews(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(nil, nil, nil).
Times(1)
p := gitea.NewPRNitter(logging.NewLogger(t), client, new(gitea.GiteaPRConfig))
if err := p.Report(new(report.Data), nil); err != nil {
t.Errorf("Did not expect error but got %v", err)
}
}
func Test_PRNitter_DontApproveMyOwnPR_ReviewStateComment(t *testing.T) {
t.Parallel()
client := mocks.NewClient(t)
client.
EXPECT().
CreatePullReview(mock.Anything, mock.Anything, mock.Anything, expectReviewState(giteasdk.ReviewStateComment)).
Return(nil, nil, nil).
Times(1)
client.
EXPECT().
GetMyUserInfo().
Return(&giteasdk.User{ID: 11}, nil, nil).
Times(1)
client.
EXPECT().
GetPullRequest(mock.Anything, mock.Anything, mock.Anything).
Return(&giteasdk.PullRequest{Poster: &giteasdk.User{ID: 11}}, nil, nil)
client.
EXPECT().
ListPullReviews(mock.Anything, mock.Anything, mock.Anything, mock.Anything).
Return(nil, nil, nil).
Times(1)
p := gitea.NewPRNitter(logging.NewLogger(t), client, new(gitea.GiteaPRConfig))
if err := p.Report(new(report.Data), nil); err != nil {
t.Errorf("Did not expect error but got %v", err)
}
}
func match[T any](matcher func(arg T) bool) any {
return mock.MatchedBy(matcher)
}
func expectReviewState(expected giteasdk.ReviewStateType) any {
return match[giteasdk.CreatePullReviewOptions](func(arg giteasdk.CreatePullReviewOptions) bool {
return arg.State == expected
})
}