Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Close #26: Return all open PRs instead of filtering by date #205

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Close #26: Return all open PRs instead of filtering by date #205

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions check.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ Loop:
continue
}

// Filter out commits that are too old.
if !p.UpdatedDate().Time.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
Expand Down
53 changes: 38 additions & 15 deletions check_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,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",
Expand All @@ -59,20 +59,13 @@ func TestCheck(t *testing.T) {
pullRequests: testPullRequests,
files: [][]string{},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[1]),
},
},

{
description: "check returns all new versions since the last",
source: resource.Source{
Repository: "itsdalmo/test-repository",
AccessToken: "oauthtoken",
},
version: resource.NewVersion(testPullRequests[3]),
pullRequests: testPullRequests,
files: [][]string{},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
},
Expand All @@ -93,6 +86,7 @@ func TestCheck(t *testing.T) {
{"terraform/modules/variables.tf", "travis.yml"},
},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
},
},
Expand All @@ -112,6 +106,7 @@ func TestCheck(t *testing.T) {
{"terraform/modules/variables.tf", "travis.yml"},
},
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
},
},
Expand All @@ -126,6 +121,15 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[1]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
resource.NewVersion(testPullRequests[0]),
},
},
Expand All @@ -140,6 +144,13 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[3]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[1]),
},
},
Expand All @@ -154,6 +165,13 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[3]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[4]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
},
Expand All @@ -169,6 +187,11 @@ func TestCheck(t *testing.T) {
version: resource.NewVersion(testPullRequests[5]),
pullRequests: testPullRequests,
expected: resource.CheckResponse{
resource.NewVersion(testPullRequests[11]),
resource.NewVersion(testPullRequests[8]),
resource.NewVersion(testPullRequests[7]),
resource.NewVersion(testPullRequests[6]),
resource.NewVersion(testPullRequests[5]),
resource.NewVersion(testPullRequests[3]),
resource.NewVersion(testPullRequests[2]),
resource.NewVersion(testPullRequests[1]),
Expand Down
19 changes: 6 additions & 13 deletions e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,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)
Expand Down Expand Up @@ -54,25 +57,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},
},
},
Expand Down