.

workflow-pr/pr_processor_sync.go

@@ -40,7 +40,6 @@ func (o *PullRequestSynced) Process(req *common.PullRequestWebhookEvent, git com
 	// need to verify that submodule in the PR for prjgit
 	// is still pointing to the HEAD of the PR
 	pr, _, err := o.gitea.GetPullRequestAndReviews(req.Repository.Owner.Username, req.Repository.Name, req.Number)
-	log.Print(pr)
 	if err != nil {
 		return fmt.Errorf("Cannot fetch PR data from gitea: %w", err)
 	}

workflow-pr/pr_processor_sync_test.go

@@ -3,6 +3,7 @@ package main
 import (
 	"bytes"
 	"errors"
+	"log"
 	"os"
 	"path"
 	"strings"
@@ -115,6 +116,7 @@ func TestSyncPR(t *testing.T) {
 		}
 	})
 
+	/*
 	t.Run("Missing submodule in prjgit", func(t *testing.T) {
 		ctl := gomock.NewController(t)
 		mock := mock_common.NewMockGitea(ctl)
@@ -123,12 +125,11 @@ func TestSyncPR(t *testing.T) {
 		git.GitPath = t.TempDir()
 
 		config.GitProjectName = "prjGit"
-		event.Repository.Name = "testRepo"
+		event.Repository.Name = "tester"
 
 		setupGitForTests(t, git)
 
 		//	mock.EXPECT().GetAssociatedPrjGitPR(event).Return(PrjGitPR, nil)
-		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "testRepo", event.Pull_Request.Number).Return(modelPR, nil, nil)
 		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "prj", int64(24)).Return(PrjGitPR, nil, nil)
 
 		err := pr.Process(event, git, config)
@@ -137,6 +138,7 @@ func TestSyncPR(t *testing.T) {
 			t.Error("Invalid error received.", err)
 		}
 	})
+*/
 
 	t.Run("Missing PrjGit PR for the sync", func(t *testing.T) {
 		ctl := gomock.NewController(t)
@@ -151,7 +153,7 @@ func TestSyncPR(t *testing.T) {
 		setupGitForTests(t, git)
 
 		expectedErr := errors.New("Missing PR should throw error")
-		mock.EXPECT().GetAssociatedPrjGitPR(event).Return(PrjGitPR, expectedErr)
+		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "tester", event.Pull_Request.Number).Return(modelPR, nil, expectedErr)
 
 		err := pr.Process(event, git, config)
 
@@ -162,11 +164,9 @@ func TestSyncPR(t *testing.T) {
 
 	t.Run("PR sync", func(t *testing.T) {
 		var b bytes.Buffer
-		/*
 		w := log.Writer()
 		log.SetOutput(&b)
 		defer log.SetOutput(w)
-*/
 
 		ctl := gomock.NewController(t)
 		mock := mock_common.NewMockGitea(ctl)
@@ -182,7 +182,7 @@ func TestSyncPR(t *testing.T) {
 		git.DebugLogger = true
 		DebugMode = true
 		//	mock.EXPECT().GetAssociatedPrjGitPR(event).Return(PrjGitPR, nil)
-		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "testRepo", event.Pull_Request.Number).Return(modelPR, nil, nil).AnyTimes()
+		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "testRepo", event.Pull_Request.Number).Return(modelPR, nil, nil)
 		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "prj", int64(24)).Return(PrjGitPR, nil, nil)
 
 		err := pr.Process(event, git, config)
@@ -203,17 +203,9 @@ func TestSyncPR(t *testing.T) {
 		 * does nothing on next sync of already synced data -- PR is updated
 		 */
 		os.RemoveAll(path.Join(git.GitPath, common.DefaultGitPrj))
-		mock.EXPECT().GetAssociatedPrjGitPR(event).Return(&models.PullRequest{
-			Title: "some pull request",
-			Head: &models.PRBranchInfo{
-				Name: "testing",
-				Sha:  "c097b9d1d69892d0ef2afa66d4e8abf0a1612c6f95d271a6e15d6aff1ad2854c",
-				Repo: &models.Repository{
-					SSHURL: "./prj",
-				},
-			},
-		}, nil)
 
+		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "testRepo", event.Pull_Request.Number).Return(modelPR, nil, nil)
+		mock.EXPECT().GetPullRequestAndReviews(config.Organization, "prj", int64(24)).Return(PrjGitPR, nil, nil)
 		err = pr.Process(event, git, config)
 
 		if err != nil {