update tests

Signed-off-by: Raghav Kaul <[email protected]>
ossf · May 23, 2023 · a313680 · a313680
1 parent 1e08b55
commit a313680
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/clients/gitlabrepo/commits.go b/clients/gitlabrepo/commits.go
@@ -65,7 +65,7 @@ func (handler *commitsHandler) listRawCommits() ([]*gitlab.Commit, error) {
 	return handler.commitsRaw, nil
 }
 
-// zip combines Commit and MergeRequest information from the GitLab REST API with
+// zip combines Commit information from the GitLab REST API with MergeRequests
 // information from the GitLab GraphQL API. The REST API doesn't provide any way to
 // get from Commits -> MRs that they were part of or vice-versa (MRs -> commits they
 // contain), except through a separate API call. Instead of calling the REST API

diff --git a/clients/gitlabrepo/graphql_test.go b/clients/gitlabrepo/graphql_test.go
@@ -31,13 +31,13 @@ func TestGitlabRepoE2E(t *testing.T) {
 	}
 	t.Parallel()
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "Githubrepo Suite")
+	RunSpecs(t, "GitLab Repo Suite")
 }
 
 var _ = Describe("E2E TEST: gitlabrepo.graphqlHandler", func() {
 	var graphqlhandler graphqlHandler
 
-	Context("E2E TEST: Confirm query result", func() {
+	Context("E2E TEST: Confirm query result - GitLab", func() {
 		It("Should have sufficient number of merge requests", func() {
 			repo, err := MakeGitlabRepo("gitlab.com/gitlab-org/gitlab")
 			Expect(err).Should(BeNil())

diff --git a/e2e/ci_tests_test.go b/e2e/ci_tests_test.go
@@ -112,7 +112,7 @@ var _ = Describe("E2E TEST:"+checks.CheckCITests, func() {
 			repoClient, err := gitlabrepo.CreateGitlabClientWithToken(context.Background(), os.Getenv("GITLAB_AUTH_TOKEN"), repo)
 			Expect(err).Should(BeNil())
 			// url to commit is https://gitlab.com/gitlab-org/gitlab/-/commit/8ae23fa220d73fa07501aabd94214c9e83fe61a0
-			err = repoClient.InitRepo(repo, "HEAD", 0)
+			err = repoClient.InitRepo(repo, "8ae23fa220d73fa07501aabd94214c9e83fe61a0", 0)
 			Expect(err).Should(BeNil())
 			req := checker.CheckRequest{
 				Ctx:        context.Background(),
@@ -122,12 +122,13 @@ var _ = Describe("E2E TEST:"+checks.CheckCITests, func() {
 			}
 			expected := scut.TestReturn{
 				Error:         nil,
+				Score:         8,
 				NumberOfWarn:  0,
 				NumberOfInfo:  0,
 				NumberOfDebug: 13,
 			}
 			result := checks.CITests(&req)
-			Expect(result.Score).Should(BeNumerically(">", expected.Score))
+			Expect(result.Score).Should(BeNumerically("==", expected.Score))
 			Expect(result.Error).Should(BeNil())
 			Expect(repoClient.Close()).Should(BeNil())
 		})
@@ -140,7 +141,7 @@ var _ = Describe("E2E TEST:"+checks.CheckCITests, func() {
 			repoClient, err := gitlabrepo.CreateGitlabClientWithToken(context.Background(), os.Getenv("GITLAB_AUTH_TOKEN"), repo)
 			Expect(err).Should(BeNil())
 			// url to commit is https://gitlab.com/fdroid/fdroidclient/-/commit/a1d33881902cee33586a4fd4ee1538042a7bdedf
-			err = repoClient.InitRepo(repo, "HEAD", 0)
+			err = repoClient.InitRepo(repo, "a1d33881902cee33586a4fd4ee1538042a7bdedf", 0)
 			Expect(err).Should(BeNil())
 			req := checker.CheckRequest{
 				Ctx:        context.Background(),
@@ -150,12 +151,13 @@ var _ = Describe("E2E TEST:"+checks.CheckCITests, func() {
 			}
 			expected := scut.TestReturn{
 				Error:         nil,
+				Score:         10,
 				NumberOfWarn:  0,
 				NumberOfInfo:  0,
 				NumberOfDebug: 1,
 			}
 			result := checks.CITests(&req)
-			Expect(result.Score).Should(BeNumerically(">", expected.Score))
+			Expect(result.Score).Should(BeNumerically("==", expected.Score))
 			Expect(result.Error).Should(BeNil())
 			Expect(repoClient.Close()).Should(BeNil())
 		})

diff --git a/e2e/code_review_test.go b/e2e/code_review_test.go
@@ -159,7 +159,7 @@ var _ = Describe("E2E TEST:"+checks.CheckCodeReview, func() {
 		Expect(err).Should(BeNil())
 		repoClient, err := gitlabrepo.CreateGitlabClientWithToken(context.Background(), os.Getenv("GITLAB_AUTH_TOKEN"), repo)
 		Expect(err).Should(BeNil())
-		err = repoClient.InitRepo(repo, "680a1154cf3806390c2e4a9e95a7c6d6107b470f", 0)
+		err = repoClient.InitRepo(repo, "1f7ed43c120047102862d9d1d644f5b2de7a47f2", 0)
 		Expect(err).Should(BeNil())
 
 		req := checker.CheckRequest{
@@ -170,7 +170,7 @@ var _ = Describe("E2E TEST:"+checks.CheckCodeReview, func() {
 		}
 		expected := scut.TestReturn{
 			Error:         nil,
-			Score:         3,
+			Score:         0,
 			NumberOfDebug: 1,
 		}
 		result := checks.CodeReview(&req)