fix tests

Signed-off-by: Raghav Kaul <[email protected]>
ossf · May 17, 2023 · 5c56572 · 5c56572
1 parent 3722a44
commit 5c56572
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/clients/gitlabrepo/checkruns.go b/clients/gitlabrepo/checkruns.go
@@ -34,7 +34,7 @@ func (handler *checkrunsHandler) init(repourl *repoURL) {
 
 func (handler *checkrunsHandler) listCheckRunsForRef(ref string) ([]clients.CheckRun, error) {
 	pipelines, _, err := handler.glClient.Pipelines.ListProjectPipelines(
-		handler.repourl.project, &gitlab.ListProjectPipelinesOptions{})
+		handler.repourl.projectID, &gitlab.ListProjectPipelinesOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("request for pipelines returned error: %w", err)
 	}

diff --git a/clients/gitlabrepo/issues.go b/clients/gitlabrepo/issues.go
@@ -40,7 +40,7 @@ func (handler *issuesHandler) init(repourl *repoURL) {
 func (handler *issuesHandler) setup() error {
 	handler.once.Do(func() {
 		issues, _, err := handler.glClient.Issues.ListProjectIssues(
-			handler.repourl.project, &gitlab.ListProjectIssuesOptions{})
+			handler.repourl.projectID, &gitlab.ListProjectIssuesOptions{})
 		if err != nil {
 			handler.errSetup = fmt.Errorf("unable to find issues associated with the project id: %w", err)
 			return
@@ -49,7 +49,7 @@ func (handler *issuesHandler) setup() error {
 		// There doesn't seem to be a good way to get user access_levels in gitlab so the following way may seem incredibly
 		// barberic, however I couldn't find a better way in the docs.
 		projMemberships, resp, err := handler.glClient.ProjectMembers.ListAllProjectMembers(
-			handler.repourl.project, &gitlab.ListProjectMembersOptions{})
+			handler.repourl.projectID, &gitlab.ListProjectMembersOptions{})
 		if err != nil && resp.StatusCode != 401 {
 			handler.errSetup = fmt.Errorf("unable to find access tokens associated with the project id: %w", err)
 			return

diff --git a/clients/gitlabrepo/project.go b/clients/gitlabrepo/project.go
@@ -39,7 +39,7 @@ func (handler *projectHandler) init(repourl *repoURL) {
 
 func (handler *projectHandler) setup() error {
 	handler.once.Do(func() {
-		proj, _, err := handler.glClient.Projects.GetProject(handler.repourl.project, &gitlab.GetProjectOptions{})
+		proj, _, err := handler.glClient.Projects.GetProject(handler.repourl.projectID, &gitlab.GetProjectOptions{})
 		if err != nil {
 			handler.errSetup = fmt.Errorf("request for project failed with error %w", err)
 			return

diff --git a/clients/gitlabrepo/statuses.go b/clients/gitlabrepo/statuses.go
@@ -34,7 +34,7 @@ func (handler *statusesHandler) init(repourl *repoURL) {
 // for gitlab this only works if ref is SHA.
 func (handler *statusesHandler) listStatuses(ref string) ([]clients.Status, error) {
 	commitStatuses, _, err := handler.glClient.Commits.GetCommitStatuses(
-		handler.repourl.project, ref, &gitlab.GetCommitStatusesOptions{})
+		handler.repourl.projectID, ref, &gitlab.GetCommitStatusesOptions{})
 	if err != nil {
 		return nil, fmt.Errorf("error getting commit statuses: %w", err)
 	}

diff --git a/e2e/ci_tests_test.go b/e2e/ci_tests_test.go
@@ -122,7 +122,7 @@ var _ = Describe("E2E TEST:"+checks.CheckCITests, func() {
 			}
 			expected := scut.TestReturn{
 				Error:         nil,
-				Score:         0,
+				Score:         9,
 				NumberOfWarn:  0,
 				NumberOfInfo:  0,
 				NumberOfDebug: 13,
@@ -151,7 +151,7 @@ var _ = Describe("E2E TEST:"+checks.CheckCITests, func() {
 			}
 			expected := scut.TestReturn{
 				Error:         nil,
-				Score:         3,
+				Score:         7,
 				NumberOfWarn:  0,
 				NumberOfInfo:  0,
 				NumberOfDebug: 1,

diff --git a/e2e/code_review_test.go b/e2e/code_review_test.go
@@ -169,8 +169,9 @@ var _ = Describe("E2E TEST:"+checks.CheckCodeReview, func() {
 			Dlogger:    &dl,
 		}
 		expected := scut.TestReturn{
-			Error: nil,
-			Score: 3,
+			Error:         nil,
+			Score:         3,
+			NumberOfDebug: 1,
 		}
 		result := checks.CodeReview(&req)
 		Expect(scut.ValidateTestReturn(nil, "use code reviews", &expected, &result, &dl)).Should(BeTrue())
@@ -197,8 +198,9 @@ var _ = Describe("E2E TEST:"+checks.CheckCodeReview, func() {
 			Dlogger:    &dl,
 		}
 		expected := scut.TestReturn{
-			Error: nil,
-			Score: checker.MinResultScore,
+			Error:         nil,
+			Score:         checker.MinResultScore,
+			NumberOfDebug: 1,
 		}
 		result := checks.CodeReview(&req)
 		Expect(scut.ValidateTestReturn(nil, "use code reviews", &expected, &result, &dl)).Should(BeTrue())