include request version in check

[#117854649]

Signed-off-by: Jacob Frank <jfrank@pivotal.io>
This commit is contained in:
Maria Shaldibina
2016-04-21 12:03:26 -07:00
committed by Jacob Frank
parent be23c288a6
commit 049c03df34
2 changed files with 10 additions and 5 deletions

View File

@@ -64,11 +64,9 @@ func (c *CheckCommand) Run(request CheckRequest) ([]Version, error) {
upToLatest := false upToLatest := false
reversedVersions := []Version{} reversedVersions := []Version{}
for _, release := range filteredReleases {
if upToLatest { for _, release := range filteredReleases {
reversedVersions = append(reversedVersions, versionFromRelease(&release)) if !upToLatest {
} else {
if *release.Draft { if *release.Draft {
id := *release.ID id := *release.ID
upToLatest = request.Version.ID == strconv.Itoa(id) upToLatest = request.Version.ID == strconv.Itoa(id)
@@ -77,6 +75,10 @@ func (c *CheckCommand) Run(request CheckRequest) ([]Version, error) {
upToLatest = request.Version.Tag == version upToLatest = request.Version.Tag == version
} }
} }
if upToLatest {
reversedVersions = append(reversedVersions, versionFromRelease(&release))
}
} }
if !upToLatest { if !upToLatest {

View File

@@ -127,6 +127,7 @@ var _ = Describe("Check Command", func() {
Ω(err).ShouldNot(HaveOccurred()) Ω(err).ShouldNot(HaveOccurred())
Ω(response).Should(Equal([]resource.Version{ Ω(response).Should(Equal([]resource.Version{
{Tag: "v0.1.3"},
{Tag: "v0.1.4"}, {Tag: "v0.1.4"},
{Tag: "0.4.0"}, {Tag: "0.4.0"},
})) }))
@@ -164,6 +165,7 @@ var _ = Describe("Check Command", func() {
Ω(err).ShouldNot(HaveOccurred()) Ω(err).ShouldNot(HaveOccurred())
Ω(response).Should(Equal([]resource.Version{ Ω(response).Should(Equal([]resource.Version{
{Tag: "v0.1.3"},
{Tag: "v0.1.4"}, {Tag: "v0.1.4"},
{Tag: "0.4.0"}, {Tag: "0.4.0"},
{Tag: "v1"}, {Tag: "v1"},
@@ -192,6 +194,7 @@ var _ = Describe("Check Command", func() {
Ω(err).ShouldNot(HaveOccurred()) Ω(err).ShouldNot(HaveOccurred())
Ω(response).Should(Equal([]resource.Version{ Ω(response).Should(Equal([]resource.Version{
{Tag: "v0.1.3"},
{Tag: "0.4.0"}, {Tag: "0.4.0"},
})) }))
}) })
@@ -212,7 +215,7 @@ var _ = Describe("Check Command", func() {
command := resource.NewCheckCommand(githubClient) command := resource.NewCheckCommand(githubClient)
response, err := command.Run(resource.CheckRequest{ response, err := command.Run(resource.CheckRequest{
Version: resource.Version{ID: "3"}, Version: resource.Version{ID: "2"},
Source: resource.Source{Drafts: true}, Source: resource.Source{Drafts: true},
}) })
Ω(err).ShouldNot(HaveOccurred()) Ω(err).ShouldNot(HaveOccurred())