Merge pull request #101 from telia-oss/add-base-branch-tests

Add tests for base_branch
telia-oss · May 2, 2019 · e602067 · e602067
2 parents 61426f1 + 9d98c3e
commit e602067
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 15 deletions.
diff --git a/check_test.go b/check_test.go
@@ -10,12 +10,13 @@ import (
 
 var (
 	testPullRequests = []*resource.PullRequest{
-		createTestPR(1, true, false),
-		createTestPR(2, false, false),
-		createTestPR(3, false, false),
-		createTestPR(4, false, false),
-		createTestPR(5, false, true),
-		createTestPR(6, false, false),
+		createTestPR(1, "master", true, false),
+		createTestPR(2, "master", false, false),
+		createTestPR(3, "master", false, false),
+		createTestPR(4, "master", false, false),
+		createTestPR(5, "master", false, true),
+		createTestPR(6, "master", false, false),
+		createTestPR(7, "develop", false, false),
 	}
 )
 
@@ -136,6 +137,20 @@ func TestCheck(t *testing.T) {
 				resource.NewVersion(testPullRequests[1]),
 			},
 		},
+		{
+			description: "check supports specifying base branch",
+			source: resource.Source{
+				Repository:  "itsdalmo/test-repository",
+				AccessToken: "oauthtoken",
+				BaseBranch:  "develop",
+			},
+			version:      resource.Version{},
+			pullRequests: testPullRequests,
+			files:        [][]string{},
+			expected: resource.CheckResponse{
+				resource.NewVersion(testPullRequests[6]),
+			},
+		},
 	}
 
 	for _, tc := range tests {

diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go
@@ -23,7 +23,7 @@ var (
 	latestDateTime       = time.Date(2018, time.May, 14, 10, 51, 58, 0, time.UTC)
 	developCommitID      = "ac771f3b69cbd63b22bbda553f827ab36150c640"
 	developPullRequestID = "6"
-	developDateTime      = time.Date(2018, time.May, 14, 10, 51, 58, 0, time.UTC)
+	developDateTime      = time.Date(2018, time.September, 25, 21, 00, 16, 0, time.UTC)
 )
 
 func TestCheckE2E(t *testing.T) {
@@ -109,6 +109,22 @@ func TestCheckE2E(t *testing.T) {
 				resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
 			},
 		},
+
+		{
+			description: "check works with custom base branch",
+			source: resource.Source{
+				Repository:    "itsdalmo/test-repository",
+				AccessToken:   os.Getenv("GITHUB_ACCESS_TOKEN"),
+				V3Endpoint:    "https://api.github.com/",
+				V4Endpoint:    "https://api.github.com/graphql",
+				BaseBranch:    "develop",
+				DisableCISkip: true,
+			},
+			version: resource.Version{},
+			expected: resource.CheckResponse{
+				resource.Version{PR: developPullRequestID, Commit: developCommitID, CommittedDate: developDateTime},
+			},
+		},
 	}
 
 	for _, tc := range tests {

diff --git a/in_test.go b/in_test.go
@@ -38,7 +38,7 @@ func TestGet(t *testing.T) {
 				CommittedDate: time.Time{},
 			},
 			parameters:     resource.GetParameters{},
-			pullRequest:    createTestPR(1, false, false),
+			pullRequest:    createTestPR(1, "master", false, false),
 			versionString:  `{"pr":"pr1","commit":"commit1","committed":"0001-01-01T00:00:00Z"}`,
 			metadataString: `[{"name":"pr","value":"1"},{"name":"url","value":"pr1 url"},{"name":"head_name","value":"pr1"},{"name":"head_sha","value":"oid1"},{"name":"base_name","value":"master"},{"name":"base_sha","value":"sha"},{"name":"message","value":"commit message1"},{"name":"author","value":"login1"}]`,
 		},
@@ -55,7 +55,7 @@ func TestGet(t *testing.T) {
 				CommittedDate: time.Time{},
 			},
 			parameters:     resource.GetParameters{},
-			pullRequest:    createTestPR(1, false, false),
+			pullRequest:    createTestPR(1, "master", false, false),
 			versionString:  `{"pr":"pr1","commit":"commit1","committed":"0001-01-01T00:00:00Z"}`,
 			metadataString: `[{"name":"pr","value":"1"},{"name":"url","value":"pr1 url"},{"name":"head_name","value":"pr1"},{"name":"head_sha","value":"oid1"},{"name":"base_name","value":"master"},{"name":"base_sha","value":"sha"},{"name":"message","value":"commit message1"},{"name":"author","value":"login1"}]`,
 		},
@@ -173,7 +173,7 @@ func TestGetSkipDownload(t *testing.T) {
 	}
 }
 
-func createTestPR(count int, skipCI bool, isCrossRepo bool) *resource.PullRequest {
+func createTestPR(count int, baseName string, skipCI bool, isCrossRepo bool) *resource.PullRequest {
 	n := strconv.Itoa(count)
 	d := time.Now().AddDate(0, 0, -count)
 	m := fmt.Sprintf("commit message%s", n)
@@ -187,7 +187,7 @@ func createTestPR(count int, skipCI bool, isCrossRepo bool) *resource.PullReques
 			Number:      count,
 			Title:       fmt.Sprintf("pr%s title", n),
 			URL:         fmt.Sprintf("pr%s url", n),
-			BaseRefName: "master",
+			BaseRefName: baseName,
 			HeadRefName: fmt.Sprintf("pr%s", n),
 			Repository: struct{ URL string }{
 				URL: fmt.Sprintf("repo%s url", n),

diff --git a/out_test.go b/out_test.go
@@ -32,7 +32,7 @@ func TestPut(t *testing.T) {
 				CommittedDate: time.Time{},
 			},
 			parameters:  resource.PutParameters{},
-			pullRequest: createTestPR(1, false, false),
+			pullRequest: createTestPR(1, "master", false, false),
 		},
 
 		{
@@ -49,7 +49,7 @@ func TestPut(t *testing.T) {
 			parameters: resource.PutParameters{
 				Status: "success",
 			},
-			pullRequest: createTestPR(1, false, false),
+			pullRequest: createTestPR(1, "master", false, false),
 		},
 
 		{
@@ -67,7 +67,7 @@ func TestPut(t *testing.T) {
 				Status:  "failure",
 				Context: "build",
 			},
-			pullRequest: createTestPR(1, false, false),
+			pullRequest: createTestPR(1, "master", false, false),
 		},
 
 		{
@@ -84,7 +84,7 @@ func TestPut(t *testing.T) {
 			parameters: resource.PutParameters{
 				Comment: "comment",
 			},
-			pullRequest: createTestPR(1, false, false),
+			pullRequest: createTestPR(1, "master", false, false),
 		},
 	}