Skip to content

Commit 17ec752

Browse files
committed
Revert "Close #26: Return all open PRs instead of filtering by date"
This reverts commit fd89b79.
1 parent 96f2dc5 commit 17ec752

File tree

3 files changed

+19
-29
lines changed

3 files changed

+19
-29
lines changed

check.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,11 @@ Loop:
6969
}
7070
}
7171

72+
// Filter out commits that are too old.
73+
if !versionTime.After(request.Version.CommittedDate) {
74+
continue
75+
}
76+
7277
// Filter out pull request if it does not contain at least one of the desired labels
7378
if len(request.Source.Labels) > 0 {
7479
labelFound := false

check_test.go

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func TestCheck(t *testing.T) {
6464
},
6565

6666
{
67-
description: "check returns all open PRs if there is a previous",
67+
description: "check returns the previous version when its still latest",
6868
source: resource.Source{
6969
Repository: "itsdalmo/test-repository",
7070
AccessToken: "oauthtoken",
@@ -73,15 +73,7 @@ func TestCheck(t *testing.T) {
7373
pullRequests: testPullRequests,
7474
files: [][]string{},
7575
expected: resource.CheckResponse{
76-
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
77-
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
78-
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
79-
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
80-
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
81-
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
82-
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
8376
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
84-
8577
},
8678
},
8779

@@ -115,7 +107,6 @@ func TestCheck(t *testing.T) {
115107
{"terraform/modules/variables.tf", "travis.yml"},
116108
},
117109
expected: resource.CheckResponse{
118-
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
119110
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
120111
},
121112
},
@@ -135,7 +126,6 @@ func TestCheck(t *testing.T) {
135126
{"terraform/modules/variables.tf", "travis.yml"},
136127
},
137128
expected: resource.CheckResponse{
138-
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
139129
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
140130
},
141131
},
@@ -150,14 +140,6 @@ func TestCheck(t *testing.T) {
150140
version: resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
151141
pullRequests: testPullRequests,
152142
expected: resource.CheckResponse{
153-
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
154-
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
155-
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
156-
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
157-
resource.NewVersion(testPullRequests[4], testPullRequests[4].Tip.CommittedDate.Time),
158-
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
159-
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
160-
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),
161143
resource.NewVersion(testPullRequests[0], testPullRequests[0].Tip.CommittedDate.Time),
162144
},
163145
},
@@ -201,10 +183,6 @@ func TestCheck(t *testing.T) {
201183
version: resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
202184
pullRequests: testPullRequests,
203185
expected: resource.CheckResponse{
204-
resource.NewVersion(testPullRequests[8], testPullRequests[8].Tip.CommittedDate.Time),
205-
resource.NewVersion(testPullRequests[7], testPullRequests[7].Tip.CommittedDate.Time),
206-
resource.NewVersion(testPullRequests[6], testPullRequests[6].Tip.CommittedDate.Time),
207-
resource.NewVersion(testPullRequests[5], testPullRequests[5].Tip.CommittedDate.Time),
208186
resource.NewVersion(testPullRequests[3], testPullRequests[3].Tip.CommittedDate.Time),
209187
resource.NewVersion(testPullRequests[2], testPullRequests[2].Tip.CommittedDate.Time),
210188
resource.NewVersion(testPullRequests[1], testPullRequests[1].Tip.CommittedDate.Time),

e2e/e2e_test.go

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@ import (
2424
)
2525

2626
var (
27-
firstCommitID = "23dc9f552bf989d1a4aeb65ce23351dee0ec9019"
28-
firstPullRequestID = "3"
29-
firstDateTime = time.Date(2018, time.May, 11, 7, 28, 56, 0, time.UTC)
3027
targetCommitID = "a5114f6ab89f4b736655642a11e8d15ce363d882"
3128
targetPullRequestID = "4"
3229
targetDateTime = time.Date(2018, time.May, 11, 8, 43, 48, 0, time.UTC)
@@ -58,15 +55,25 @@ func TestCheckE2E(t *testing.T) {
5855
},
5956

6057
{
61-
description: "check returns all open PRs if there is a previous version",
58+
description: "check returns the previous version when its still latest",
6259
source: resource.Source{
6360
Repository: "itsdalmo/test-repository",
6461
AccessToken: os.Getenv("GITHUB_ACCESS_TOKEN"),
6562
},
6663
version: resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
6764
expected: resource.CheckResponse{
68-
resource.Version{PR: firstPullRequestID, Commit: firstCommitID, CommittedDate: firstDateTime},
69-
resource.Version{PR: targetPullRequestID, Commit: targetCommitID, CommittedDate: targetDateTime},
65+
resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
66+
},
67+
},
68+
69+
{
70+
description: "check returns all new versions since the last",
71+
source: resource.Source{
72+
Repository: "itsdalmo/test-repository",
73+
AccessToken: os.Getenv("GITHUB_ACCESS_TOKEN"),
74+
},
75+
version: resource.Version{PR: targetPullRequestID, Commit: targetCommitID, CommittedDate: targetDateTime},
76+
expected: resource.CheckResponse{
7077
resource.Version{PR: latestPullRequestID, Commit: latestCommitID, CommittedDate: latestDateTime},
7178
},
7279
},

0 commit comments

Comments
 (0)