diff --git a/check.go b/check.go index 4df41d04..112779bd 100644 --- a/check.go +++ b/check.go @@ -69,11 +69,6 @@ Loop: } } - // Filter out commits that are too old. - if !versionTime.After(request.Version.CommittedDate) { - continue - } - // Filter out pull request if it does not contain at least one of the desired labels if len(request.Source.Labels) > 0 { labelFound := false diff --git a/check_test.go b/check_test.go index 86b7b540..a795348d 100644 --- a/check_test.go +++ b/check_test.go @@ -64,7 +64,7 @@ func TestCheck(t *testing.T) { }, { - description: "check returns the previous version when its still latest", + description: "check returns all open PRs if there is a previous", source: resource.Source{ Repository: "itsdalmo/test-repository", AccessToken: "oauthtoken", @@ -73,7 +73,15 @@ func TestCheck(t *testing.T) { pullRequests: testPullRequests, files: [][]string{}, expected: resource.CheckResponse{ + resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time), + }, }, @@ -107,6 +115,7 @@ func TestCheck(t *testing.T) { {"terraform/modules/variables.tf", "travis.yml"}, }, expected: resource.CheckResponse{ + resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time), }, }, @@ -126,6 +135,7 @@ func TestCheck(t *testing.T) { {"terraform/modules/variables.tf", "travis.yml"}, }, expected: resource.CheckResponse{ + resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time), }, }, @@ -140,6 +150,14 @@ func TestCheck(t *testing.T) { version: resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time), pullRequests: testPullRequests, expected: resource.CheckResponse{ + resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[0], testPullRequests[0].Tip.CommittedDate.Time), }, }, @@ -183,6 +201,10 @@ func TestCheck(t *testing.T) { version: resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time), pullRequests: testPullRequests, expected: resource.CheckResponse{ + resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time), + resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time), resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time), diff --git a/e2e/e2e_test.go b/e2e/e2e_test.go index 660410a2..51701798 100644 --- a/e2e/e2e_test.go +++ b/e2e/e2e_test.go @@ -24,6 +24,9 @@ import ( ) var ( + firstCommitID = "23dc9f552bf989d1a4aeb65ce23351dee0ec9019" + firstPullRequestID = "3" + firstDateTime = time.Date(2018, time.May, 11, 7, 28, 56, 0, time.UTC) targetCommitID = "a5114f6ab89f4b736655642a11e8d15ce363d882" targetPullRequestID = "4" targetDateTime = time.Date(2018, time.May, 11, 8, 43, 48, 0, time.UTC) @@ -55,25 +58,15 @@ func TestCheckE2E(t *testing.T) { }, { - description: "check returns the previous version when its still latest", + description: "check returns all open PRs if there is a previous version", source: resource.Source{ Repository: "itsdalmo/test-repository", AccessToken: os.Getenv("GITHUB_ACCESS_TOKEN"), }, version: resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime}, expected: resource.CheckResponse{ - resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime}, - }, - }, - - { - description: "check returns all new versions since the last", - source: resource.Source{ - Repository: "itsdalmo/test-repository", - AccessToken: os.Getenv("GITHUB_ACCESS_TOKEN"), - }, - version: resource.Version{PR: targetPullRequestID, Commit: targetCommitID, CommittedDate: targetDateTime}, - expected: resource.CheckResponse{ + resource.Version{PR: firstPullRequestID, Commit: firstCommitID, CommittedDate: firstDateTime}, + resource.Version{PR: targetPullRequestID, Commit: targetCommitID, CommittedDate: targetDateTime}, resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime}, }, },