From 0f5d1289cdda96da2780a980aacb05d7b73de280 Mon Sep 17 00:00:00 2001 From: Tore Martin Hagen <93583343+ToreMerkely@users.noreply.github.com> Date: Fri, 11 Oct 2024 08:01:16 +0200 Subject: [PATCH] Moved gitlab tests from ewelinawilkosz to kosli-dev (#352) --- cmd/kosli/assertPRGitlab_test.go | 20 ++++++++-------- cmd/kosli/attestPRGitlab_test.go | 18 +++++++------- .../reportEvidenceArtifactPRGitlab_test.go | 22 ++++++++--------- .../reportEvidenceCommitPRGitlab_test.go | 16 ++++++------- internal/gitlab/gitlab_test.go | 24 +++++++++---------- 5 files changed, 50 insertions(+), 50 deletions(-) diff --git a/cmd/kosli/assertPRGitlab_test.go b/cmd/kosli/assertPRGitlab_test.go index d750b33b5..a21ba3698 100644 --- a/cmd/kosli/assertPRGitlab_test.go +++ b/cmd/kosli/assertPRGitlab_test.go @@ -31,26 +31,26 @@ func (suite *AssertPRGitlabCommandTestSuite) TestAssertPRGitlabCmd() { tests := []cmdTestCase{ { name: "assert Gitlab PR evidence passes when commit has a PR in gitlab", - cmd: `assert mergerequest gitlab --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo - --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, - golden: "found [1] merge request(s) in Gitlab for commit: e6510880aecdc05d79104d937e1adb572bd91911\n", + cmd: `assert mergerequest gitlab --gitlab-org kosli-dev --repository merkely-gitlab-demo + --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, + golden: "found [1] merge request(s) in Gitlab for commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\n", }, { name: "assert Gitlab PR evidence with aliases 1", - cmd: `assert mr gl --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo - --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, - golden: "found [1] merge request(s) in Gitlab for commit: e6510880aecdc05d79104d937e1adb572bd91911\n", + cmd: `assert mr gl --gitlab-org kosli-dev --repository merkely-gitlab-demo + --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, + golden: "found [1] merge request(s) in Gitlab for commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\n", }, { name: "assert Gitlab PR evidence with aliases 2", - cmd: `assert pullrequest gitlab --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo - --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, - golden: "found [1] merge request(s) in Gitlab for commit: e6510880aecdc05d79104d937e1adb572bd91911\n", + cmd: `assert pullrequest gitlab --gitlab-org kosli-dev --repository merkely-gitlab-demo + --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, + golden: "found [1] merge request(s) in Gitlab for commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\n", }, { wantError: true, name: "assert Gitlab PR evidence fails when commit has no PRs in gitlab", - cmd: `assert mergerequest gitlab --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo + cmd: `assert mergerequest gitlab --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, golden: "Error: assert failed: found no merge request(s) in Gitlab for commit: 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6\n", }, diff --git a/cmd/kosli/attestPRGitlab_test.go b/cmd/kosli/attestPRGitlab_test.go index 8bd818890..d4c20a5d9 100644 --- a/cmd/kosli/attestPRGitlab_test.go +++ b/cmd/kosli/attestPRGitlab_test.go @@ -37,10 +37,10 @@ func (suite *AttestGitlabPRCommandTestSuite) SetupTest() { var err error suite.tmpDir, err = os.MkdirTemp("", "testDir") require.NoError(suite.T(), err) - _, err = testHelpers.CloneGitRepo("https://gitlab.com/ewelinawilkosz/merkely-gitlab-demo.git", suite.tmpDir) + _, err = testHelpers.CloneGitRepo("https://gitlab.com/kosli-dev/merkely-gitlab-demo.git", suite.tmpDir) require.NoError(suite.T(), err) - suite.defaultKosliArguments = fmt.Sprintf(" --flow %s --trail %s --repo-root %s --commit e6510880aecdc05d79104d937e1adb572bd91911 --host %s --org %s --api-token %s", suite.flowName, suite.trailName, suite.tmpDir, global.Host, global.Org, global.ApiToken) + suite.defaultKosliArguments = fmt.Sprintf(" --flow %s --trail %s --repo-root %s --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01 --host %s --org %s --api-token %s", suite.flowName, suite.trailName, suite.tmpDir, global.Host, global.Org, global.ApiToken) CreateFlowWithTemplate(suite.flowName, "testdata/valid_template.yml", suite.T()) BeginTrail(suite.trailName, suite.flowName, "", suite.T()) CreateArtifactOnTrail(suite.flowName, suite.trailName, "cli", suite.artifactFingerprint, "file1", suite.T()) @@ -80,43 +80,43 @@ func (suite *AttestGitlabPRCommandTestSuite) TestAttestGitlabPRCmd() { wantError: true, name: "attesting against an artifact that does not exist fails", cmd: fmt.Sprintf(`attest pullrequest gitlab --fingerprint 1234e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9 --name foo - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\nError: Artifact with fingerprint 1234e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9 does not exist in trail \"test-123\" of flow \"attest-gitlab-pr\" belonging to organization \"docs-cmd-test-user\"\n", }, { name: "can attest gitlab pr against an artifact using artifact name and --artifact-type", cmd: fmt.Sprintf(`attest pullrequest gitlab testdata/file1 --artifact-type file --name foo - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request attestation 'foo' is reported to trail: test-123\n", }, { name: "can attest gitlab pr against an artifact using artifact name and --artifact-type when --name does not exist in the trail template", cmd: fmt.Sprintf(`attest pullrequest gitlab testdata/file1 --artifact-type file --name bar - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request attestation 'bar' is reported to trail: test-123\n", }, { name: "can attest gitlab pr against an artifact using --fingerprint", cmd: fmt.Sprintf(`attest pullrequest gitlab --fingerprint 7509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9 --name foo - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request attestation 'foo' is reported to trail: test-123\n", }, { name: "can attest gitlab pr against a trail", cmd: fmt.Sprintf(`attest pullrequest gitlab --name bar - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request attestation 'bar' is reported to trail: test-123\n", }, { name: "can attest gitlab pr against a trail when name is not found in the trail template", cmd: fmt.Sprintf(`attest pullrequest gitlab --name additional - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request attestation 'additional' is reported to trail: test-123\n", }, { name: "can attest gitlab pr against an artifact it is created using dot syntax in --name", cmd: fmt.Sprintf(`attest pullrequest gitlab --name cli.foo - --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), + --gitlab-org kosli-dev --repository merkely-gitlab-demo %s`, suite.defaultKosliArguments), goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request attestation 'foo' is reported to trail: test-123\n", }, } diff --git a/cmd/kosli/reportEvidenceArtifactPRGitlab_test.go b/cmd/kosli/reportEvidenceArtifactPRGitlab_test.go index 68d2ac4ac..d5419199f 100644 --- a/cmd/kosli/reportEvidenceArtifactPRGitlab_test.go +++ b/cmd/kosli/reportEvidenceArtifactPRGitlab_test.go @@ -39,15 +39,15 @@ func (suite *ArtifactEvidencePRGitlabCommandTestSuite) TestArtifactEvidencePRGit { name: "report Gitlab PR evidence works when no merge requests are found", cmd: `report evidence artifact pullrequest gitlab --fingerprint ` + suite.artifactFingerprint + ` --name gl-pr --flow ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, goldenRegex: "found 0 merge request\\(s\\) for commit: 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6\n" + "gitlab merge request evidence is reported to artifact: " + suite.artifactFingerprint + "\n", }, { name: "report Gitlab PR evidence works when there are merge requests", cmd: `report evidence artifact pullrequest gitlab --fingerprint ` + suite.artifactFingerprint + ` --name gl-pr --flow ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, - goldenRegex: "found 1 merge request\\(s\\) for commit: e6510880aecdc05d79104d937e1adb572bd91911\ngitlab merge request evidence is reported to artifact: " + suite.artifactFingerprint + "\n", + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, + goldenRegex: "found 1 merge request\\(s\\) for commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\ngitlab merge request evidence is reported to artifact: " + suite.artifactFingerprint + "\n", }, { wantError: true, @@ -97,14 +97,14 @@ func (suite *ArtifactEvidencePRGitlabCommandTestSuite) TestArtifactEvidencePRGit wantError: true, name: "report Gitlab PR evidence fails when commit does not exist", cmd: `report evidence artifact pullrequest gitlab --fingerprint ` + suite.artifactFingerprint + ` --name gl-pr --flow ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit 73d7fee2f31ade8e1a9c456c324255212c3123ab` + suite.defaultKosliArguments, - goldenRegex: "Error: GET https://gitlab.com/api/v4/projects/ewelinawilkosz/merkely-gitlab-demo/repository/commits/73d7fee2f31ade8e1a9c456c324255212c3123ab/merge_requests: 404 {message: 404 Commit Not Found}\n", + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 73d7fee2f31ade8e1a9c456c324255212c3123ab` + suite.defaultKosliArguments, + goldenRegex: "Error: GET https://gitlab.com/api/v4/projects/kosli-dev/merkely-gitlab-demo/repository/commits/73d7fee2f31ade8e1a9c456c324255212c3123ab/merge_requests: 404 {message: 404 Commit Not Found}\n", }, { name: "report Gitlab PR evidence works when --assert is used and commit has a PR", cmd: `report evidence artifact pullrequest gitlab --fingerprint ` + suite.artifactFingerprint + ` --name gl-pr --flow ` + suite.flowName + ` --assert - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, goldenRegex: "found 1 merge request\\(s\\) for commit: .*\ngitlab merge request evidence is reported to artifact: .*\n", }, { @@ -112,21 +112,21 @@ func (suite *ArtifactEvidencePRGitlabCommandTestSuite) TestArtifactEvidencePRGit name: "report Gitlab PR evidence fails when --assert is used and commit has no PRs", cmd: `report evidence artifact pullrequest gitlab --fingerprint ` + suite.artifactFingerprint + ` --name gl-pr --flow ` + suite.flowName + ` --assert - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, goldenRegex: "found 0 merge request\\(s\\) for commit: .*\ngitlab merge request evidence is reported to artifact: .*\nError: assert failed: no merge request found for the given commit: .*\n", }, { wantError: true, name: "report Gitlab PR evidence fails when the artifact does not exist in the server", cmd: `report evidence artifact pullrequest gitlab testdata/file1 --artifact-type file --name gl-pr --flow ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, - goldenRegex: "found 1 merge request\\(s\\) for commit: e6510880aecdc05d79104d937e1adb572bd91911\nError: Artifact with fingerprint '7509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9' does not exist in flow 'gitlab-pr' belonging to organization 'docs-cmd-test-user'. \n", + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, + goldenRegex: "found 1 merge request\\(s\\) for commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\nError: Artifact with fingerprint '7509e5bda0c762d2bac7f90d758b5b2263fa01ccbc542ab5e3df163be08e6ca9' does not exist in flow 'gitlab-pr' belonging to organization 'docs-cmd-test-user'. \n", }, { wantError: true, name: "report Gitlab PR evidence fails when --artifact-type is unsupported", cmd: `report evidence artifact pullrequest gitlab testdata/file1 --artifact-type unsupported --name gl-pr --flow ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, goldenRegex: "Error: unsupported is not a supported artifact type\n", }, { @@ -134,7 +134,7 @@ func (suite *ArtifactEvidencePRGitlabCommandTestSuite) TestArtifactEvidencePRGit name: "report Gitlab PR evidence fails when --user-data is not found", cmd: `report evidence artifact pullrequest gitlab --fingerprint ` + suite.artifactFingerprint + ` --name gl-pr --flow ` + suite.flowName + ` --user-data non-existing.json - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, goldenRegex: "Error: open non-existing.json: no such file or directory\n", }, } diff --git a/cmd/kosli/reportEvidenceCommitPRGitlab_test.go b/cmd/kosli/reportEvidenceCommitPRGitlab_test.go index a443df2d3..9eeb1ba56 100644 --- a/cmd/kosli/reportEvidenceCommitPRGitlab_test.go +++ b/cmd/kosli/reportEvidenceCommitPRGitlab_test.go @@ -36,21 +36,21 @@ func (suite *CommitEvidencePRGitlabCommandTestSuite) TestCommitEvidencePRGitlabC { name: "report Gitlab PR evidence works when no merge requests are found", cmd: `report evidence commit pullrequest gitlab --name gl-pr --flows ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, goldenRegex: "found 0 merge request\\(s\\) for commit: 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6\n" + "gitlab merge request evidence is reported to commit: 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6\n", }, { name: "report Gitlab PR evidence works when there are merge requests", cmd: `report evidence commit pullrequest gitlab --name gl-pr --flows ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, - goldenRegex: "found 1 merge request\\(s\\) for commit: e6510880aecdc05d79104d937e1adb572bd91911\ngitlab merge request evidence is reported to commit: e6510880aecdc05d79104d937e1adb572bd91911\n", + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, + goldenRegex: "found 1 merge request\\(s\\) for commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\ngitlab merge request evidence is reported to commit: f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01\n", }, { wantError: true, name: "report Gitlab PR evidence fails when --name is missing", cmd: `report evidence commit pullrequest gitlab --flows ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, goldenRegex: "Error: required flag\\(s\\) \"name\" not set\n", }, { @@ -86,15 +86,15 @@ func (suite *CommitEvidencePRGitlabCommandTestSuite) TestCommitEvidencePRGitlabC wantError: true, name: "report Gitlab PR evidence fails when commit does not exist", cmd: `report evidence commit pullrequest gitlab --name gl-pr --flows ` + suite.flowName + ` - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit 73d7fee2f31ade8e1a9c456c324255212c3123ab` + suite.defaultKosliArguments, - goldenRegex: "Error: GET https://gitlab.com/api/v4/projects/ewelinawilkosz/merkely-gitlab-demo/repository/commits/73d7fee2f31ade8e1a9c456c324255212c3123ab/merge_requests: 404 {message: 404 Commit Not Found}\n", + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 73d7fee2f31ade8e1a9c456c324255212c3123ab` + suite.defaultKosliArguments, + goldenRegex: "Error: GET https://gitlab.com/api/v4/projects/kosli-dev/merkely-gitlab-demo/repository/commits/73d7fee2f31ade8e1a9c456c324255212c3123ab/merge_requests: 404 {message: 404 Commit Not Found}\n", }, { wantError: true, name: "report Gitlab PR evidence fails when --assert is used and commit has no PRs", cmd: `report evidence commit pullrequest gitlab --name gl-pr --flows ` + suite.flowName + ` --assert - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit 2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6` + suite.defaultKosliArguments, goldenRegex: "found 0 merge request\\(s\\) for commit: .*\ngitlab merge request evidence is reported to commit: .*\nError: assert failed: no merge request found for the given commit: .*\n", }, { @@ -102,7 +102,7 @@ func (suite *CommitEvidencePRGitlabCommandTestSuite) TestCommitEvidencePRGitlabC name: "report Gitlab PR evidence fails when --user-data is not found", cmd: `report evidence commit pullrequest gitlab --name gl-pr --flows ` + suite.flowName + ` --user-data non-existing.json - --build-url http://www.example.com --gitlab-org ewelinawilkosz --repository merkely-gitlab-demo --commit e6510880aecdc05d79104d937e1adb572bd91911` + suite.defaultKosliArguments, + --build-url http://www.example.com --gitlab-org kosli-dev --repository merkely-gitlab-demo --commit f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01` + suite.defaultKosliArguments, goldenRegex: "Error: open non-existing.json: no such file or directory\n", }, } diff --git a/internal/gitlab/gitlab_test.go b/internal/gitlab/gitlab_test.go index ef7eb35b1..3a11d3a52 100644 --- a/internal/gitlab/gitlab_test.go +++ b/internal/gitlab/gitlab_test.go @@ -99,9 +99,9 @@ func (suite *GitlabTestSuite) TestMergeRequestsForCommit() { }, { name: "valid token and commit with an MR find one MR", - commit: "e6510880aecdc05d79104d937e1adb572bd91911", + commit: "f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01", gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -113,7 +113,7 @@ func (suite *GitlabTestSuite) TestMergeRequestsForCommit() { name: "valid token and commit with no MRs find no MRs", commit: "2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6", gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -125,7 +125,7 @@ func (suite *GitlabTestSuite) TestMergeRequestsForCommit() { name: "valid token and wrong commit causes an error", commit: "ab4979c426d2d8e77586cfaaf32a7d50a1439bfa", gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -174,9 +174,9 @@ func (suite *GitlabTestSuite) TestPREvidenceForCommit() { }, { name: "valid token and commit with an MR find one MR", - commit: "e6510880aecdc05d79104d937e1adb572bd91911", + commit: "f6d2c1a288f2c400c04e8451f4fdddb1f3b4ce01", gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -188,7 +188,7 @@ func (suite *GitlabTestSuite) TestPREvidenceForCommit() { name: "valid token and commit with no MRs find no MRs", commit: "2ec23dda01fc85e3f94a2b5ea8cb8cf7e79c4ed6", gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -200,7 +200,7 @@ func (suite *GitlabTestSuite) TestPREvidenceForCommit() { name: "valid token and wrong commit causes an error", commit: "ab4979c426d2d8e77586cfaaf32a7d50a1439bfa", gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -250,19 +250,19 @@ func (suite *GitlabTestSuite) TestGetMergeRequestApprovers() { name: "valid token and mrIID get the correct approvers", mrIID: 2, gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, result: result{ - approvers: []string{"Sami Alajrami (@sami.alajrami)"}, + approvers: []string{"Tore Martin Hagen (@tore7681647)"}, }, }, { name: "valid token and mrIID with no approvals returns empty list", mrIID: 1, gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true, @@ -274,7 +274,7 @@ func (suite *GitlabTestSuite) TestGetMergeRequestApprovers() { name: "valid token and non-existing mrIID causes an error", mrIID: 200, gitlabConfig: &GitlabConfig{ - Org: "ewelinawilkosz", + Org: "kosli-dev", Repository: "merkely-gitlab-demo", }, requireEnvVars: true,