Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion pkg/provider/bitbucketcloud/bitbucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (v *Provider) CreateStatus(_ context.Context, event *info.Event, statusopts
}

cso := &bitbucket.CommitStatusOptions{
Key: v.pacInfo.ApplicationName,
Key: provider.GetCheckName(statusopts, v.pacInfo),
Url: detailsURL,
State: statusopts.Conclusion,
Description: statusopts.Title,
Expand Down
51 changes: 38 additions & 13 deletions pkg/provider/bitbucketcloud/bitbucket_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -273,93 +273,118 @@ func TestGetCommitInfo(t *testing.T) {
}

func TestCreateStatus(t *testing.T) {
originalPipelineRunName := "hello-af9ch"
tests := []struct {
name string
wantErr bool
status provider.StatusOpts
applicationName string
expectedDescSubstr string
expectedCommentSubstr string
}{
{
name: "skipped",
status: provider.StatusOpts{
Conclusion: "skipped",
Conclusion: "skipped",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "Skipping",
},
{
name: "neutral",
status: provider.StatusOpts{
Conclusion: "neutral",
Conclusion: "neutral",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "stopped",
},
{
name: "completed with comment",
status: provider.StatusOpts{
Conclusion: "success",
Status: "completed",
Text: "Happy as a bunny",
Conclusion: "success",
Status: "completed",
OriginalPipelineRunName: originalPipelineRunName,
Text: "Happy as a bunny",
},
expectedDescSubstr: "validated",
expectedCommentSubstr: "Happy as a bunny",
},
{
name: "failed",
status: provider.StatusOpts{
Conclusion: "failure",
Conclusion: "failure",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "Failed",
},
{
name: "details url",
status: provider.StatusOpts{
Conclusion: "failure",
DetailsURL: "http://fail.com",
Conclusion: "failure",
DetailsURL: "http://fail.com",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "Failed",
},
{
name: "pending",
status: provider.StatusOpts{
Conclusion: "pending",
Conclusion: "pending",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "started",
},
{
name: "success",
status: provider.StatusOpts{
Conclusion: "success",
Conclusion: "success",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "validated",
},
{
name: "completed",
status: provider.StatusOpts{
Conclusion: "completed",
Conclusion: "completed",
OriginalPipelineRunName: originalPipelineRunName,
},
expectedDescSubstr: "Completed",
},
{
name: "application name",
status: provider.StatusOpts{
Conclusion: "completed",
OriginalPipelineRunName: originalPipelineRunName,
},
applicationName: "HELLO APP",
expectedDescSubstr: "Completed",
},
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
ctx, _ := rtesting.SetupFakeContext(t)
bbclient, mux, tearDown := bbcloudtest.SetupBBCloudClient(t)
defer tearDown()

appName := tt.applicationName
if appName == "" {
appName = settings.PACApplicationNameDefaultValue
}

v := &Provider{
bbClient: bbclient,
run: params.New(),
pacInfo: &info.PacOpts{
Settings: settings.Settings{
ApplicationName: settings.PACApplicationNameDefaultValue,
ApplicationName: appName,
},
},
}
event := bbcloudtest.MakeEvent(nil)
event.EventType = "pull_request"
event.Provider.Token = "token"

bbcloudtest.MuxCreateCommitstatus(t, mux, event, tt.expectedDescSubstr, tt.status)
bbcloudtest.MuxCreateCommitstatus(t, mux, event, tt.expectedDescSubstr, appName, tt.status)
bbcloudtest.MuxCreateComment(t, mux, event, tt.expectedCommentSubstr)

err := v.CreateStatus(ctx, event, tt.status)
Expand Down
5 changes: 4 additions & 1 deletion pkg/provider/bitbucketcloud/test/bbcloudtest.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import (

"github.com/ktrysmt/go-bitbucket"
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/info"
"github.com/openshift-pipelines/pipelines-as-code/pkg/params/settings"
"github.com/openshift-pipelines/pipelines-as-code/pkg/provider"
"github.com/openshift-pipelines/pipelines-as-code/pkg/provider/bitbucketcloud/types"
"gotest.tools/v3/assert"
Expand Down Expand Up @@ -144,7 +145,7 @@ func MuxRepoInfo(t *testing.T, mux *http.ServeMux, event *info.Event, repo *bitb
})
}

func MuxCreateCommitstatus(t *testing.T, mux *http.ServeMux, event *info.Event, expectedDescSubstr string, expStatus provider.StatusOpts) {
func MuxCreateCommitstatus(t *testing.T, mux *http.ServeMux, event *info.Event, expectedDescSubstr, applicationName string, expStatus provider.StatusOpts) {
t.Helper()

path := fmt.Sprintf("/repositories/%s/%s/commit/%s/statuses/build", event.Organization, event.Repository, event.SHA)
Expand All @@ -153,6 +154,8 @@ func MuxCreateCommitstatus(t *testing.T, mux *http.ServeMux, event *info.Event,
bit, _ := io.ReadAll(r.Body)
err := json.Unmarshal(bit, cso)
assert.NilError(t, err)
pacOpts := &info.PacOpts{Settings: settings.Settings{ApplicationName: applicationName}}
assert.Equal(t, provider.GetCheckName(expStatus, pacOpts), cso.Key)

if expStatus.DetailsURL != "" {
assert.Equal(t, expStatus.DetailsURL, cso.Url)
Expand Down