From b4268e6bab4e6335f7057a948d6f248fa36f01a5 Mon Sep 17 00:00:00 2001 From: Gabriel Adrian Samfira Date: Tue, 20 May 2025 09:52:13 +0000 Subject: [PATCH] Fix tests Signed-off-by: Gabriel Adrian Samfira --- database/sql/enterprise_test.go | 8 -------- database/sql/gitea_test.go | 18 +++++++++--------- database/sql/github_test.go | 15 ++++++++------- database/sql/repositories_test.go | 2 +- 4 files changed, 18 insertions(+), 25 deletions(-) diff --git a/database/sql/enterprise_test.go b/database/sql/enterprise_test.go index 9d81287d..24e7bee7 100644 --- a/database/sql/enterprise_test.go +++ b/database/sql/enterprise_test.go @@ -219,14 +219,6 @@ func (s *EnterpriseTestSuite) TestCreateEnterpriseInvalidDBPassphrase() { func (s *EnterpriseTestSuite) TestCreateEnterpriseDBCreateErr() { s.Fixtures.SQLMock.ExpectBegin() - s.Fixtures.SQLMock. - ExpectQuery(regexp.QuoteMeta("SELECT * FROM `github_credentials` WHERE user_id = ? AND name = ? AND `github_credentials`.`deleted_at` IS NULL ORDER BY `github_credentials`.`id` LIMIT ?")). - WithArgs(s.adminUserID, s.Fixtures.Enterprises[0].CredentialsName, 1). - WillReturnRows(sqlmock.NewRows([]string{"id", "endpoint_name"}).AddRow(s.testCreds.ID, s.testCreds.Endpoint.Name)) - s.Fixtures.SQLMock.ExpectQuery(regexp.QuoteMeta("SELECT * FROM `github_endpoints` WHERE `github_endpoints`.`name` = ? AND `github_endpoints`.`deleted_at` IS NULL")). - WithArgs(s.testCreds.Endpoint.Name). - WillReturnRows(sqlmock.NewRows([]string{"name"}). - AddRow(s.testCreds.Endpoint.Name)) s.Fixtures.SQLMock. ExpectExec(regexp.QuoteMeta("INSERT INTO `enterprises`")). WillReturnError(fmt.Errorf("creating enterprise mock error")) diff --git a/database/sql/gitea_test.go b/database/sql/gitea_test.go index 8eaaf23b..a70d3b1f 100644 --- a/database/sql/gitea_test.go +++ b/database/sql/gitea_test.go @@ -61,7 +61,7 @@ func (s *GiteaTestSuite) TestCreatingEndpoint() { ctx := garmTesting.ImpersonateAdminContext(context.Background(), s.db, s.T()) createEpParams := params.CreateGiteaEndpointParams{ - Name: testEndpointName, + Name: alternetTestEndpointName, Description: testEndpointDescription, APIBaseURL: testAPIBaseURL, BaseURL: testBaseURL, @@ -70,14 +70,14 @@ func (s *GiteaTestSuite) TestCreatingEndpoint() { endpoint, err := s.db.CreateGiteaEndpoint(ctx, createEpParams) s.Require().NoError(err) s.Require().NotNil(endpoint) - s.Require().Equal(testEndpointName, endpoint.Name) + s.Require().Equal(alternetTestEndpointName, endpoint.Name) } func (s *GiteaTestSuite) TestCreatingDuplicateEndpointFails() { ctx := garmTesting.ImpersonateAdminContext(context.Background(), s.db, s.T()) createEpParams := params.CreateGiteaEndpointParams{ - Name: testEndpointName, + Name: alternetTestEndpointName, Description: testEndpointDescription, APIBaseURL: testAPIBaseURL, BaseURL: testBaseURL, @@ -95,7 +95,7 @@ func (s *GiteaTestSuite) TestGetEndpoint() { ctx := garmTesting.ImpersonateAdminContext(context.Background(), s.db, s.T()) createEpParams := params.CreateGiteaEndpointParams{ - Name: "deleteme", + Name: alternetTestEndpointName, Description: testEndpointDescription, APIBaseURL: testAPIBaseURL, BaseURL: testBaseURL, @@ -129,7 +129,7 @@ func (s *GiteaTestSuite) TestDeletingEndpoint() { ctx := garmTesting.ImpersonateAdminContext(context.Background(), s.db, s.T()) createEpParams := params.CreateGiteaEndpointParams{ - Name: testEndpointName, + Name: alternetTestEndpointName, Description: testEndpointDescription, APIBaseURL: testAPIBaseURL, BaseURL: testBaseURL, @@ -139,10 +139,10 @@ func (s *GiteaTestSuite) TestDeletingEndpoint() { s.Require().NoError(err) s.Require().NotNil(endpoint) - err = s.db.DeleteGiteaEndpoint(ctx, testEndpointName) + err = s.db.DeleteGiteaEndpoint(ctx, alternetTestEndpointName) s.Require().NoError(err) - _, err = s.db.GetGiteaEndpoint(ctx, testEndpointName) + _, err = s.db.GetGiteaEndpoint(ctx, alternetTestEndpointName) s.Require().Error(err) s.Require().ErrorIs(err, runnerErrors.ErrNotFound) } @@ -199,7 +199,7 @@ func (s *GiteaTestSuite) TestListEndpoints() { ctx := garmTesting.ImpersonateAdminContext(context.Background(), s.db, s.T()) createEpParams := params.CreateGiteaEndpointParams{ - Name: testEndpointName, + Name: alternetTestEndpointName, Description: testEndpointDescription, APIBaseURL: testAPIBaseURL, BaseURL: testBaseURL, @@ -210,7 +210,7 @@ func (s *GiteaTestSuite) TestListEndpoints() { endpoints, err := s.db.ListGiteaEndpoints(ctx) s.Require().NoError(err) - s.Require().Len(endpoints, 1) + s.Require().Len(endpoints, 2) } func (s *GiteaTestSuite) TestCreateCredentialsFailsWithUnauthorizedForAnonUser() { diff --git a/database/sql/github_test.go b/database/sql/github_test.go index f2e83fec..7b99d5e2 100644 --- a/database/sql/github_test.go +++ b/database/sql/github_test.go @@ -33,13 +33,14 @@ import ( ) const ( - testUploadBaseURL string = "https://uploads.example.com" - testBaseURL string = "https://example.com" - testAPIBaseURL string = "https://api.example.com" - testEndpointName string = "test-endpoint" - testEndpointDescription string = "test description" - testCredsName string = "test-creds" - testCredsDescription string = "test creds" + testUploadBaseURL string = "https://uploads.example.com" + testBaseURL string = "https://example.com" + testAPIBaseURL string = "https://api.example.com" + testEndpointName string = "test-endpoint" + alternetTestEndpointName string = "test-endpoint-alternate" + testEndpointDescription string = "test description" + testCredsName string = "test-creds" + testCredsDescription string = "test creds" ) type GithubTestSuite struct { diff --git a/database/sql/repositories_test.go b/database/sql/repositories_test.go index 3f8d8ca2..f27e10b5 100644 --- a/database/sql/repositories_test.go +++ b/database/sql/repositories_test.go @@ -226,7 +226,7 @@ func (s *RepoTestSuite) TestCreateRepository() { entity, err := repo.GetEntity() s.Require().Nil(err) - s.Require().Equal(s.Fixtures.CreateRepoParams.Owner, entity.ID) + s.Require().Equal(s.Fixtures.CreateRepoParams.Owner, entity.Owner) s.Require().Equal(entity.EntityType, params.ForgeEntityTypeRepository) forgeType, err := entity.GetForgeType()