test: Improve tests

Author: idirouhab

packages/cli/src/environments.ee/source-control/__tests__/source-control-git.service.test.ts

@@ -124,6 +124,17 @@ describe('SourceControlGitService', () => {
 
 				// Mock the getPrivateKeyPath to return a Windows path
 				mockPreferencesService.getPrivateKeyPath.mockResolvedValue(windowsPath);
+				// Mock getPreferences to return SSH connection type (required for new functionality)
+				mockPreferencesService.getPreferences.mockReturnValue({
+					connectionType: 'ssh',
+					connected: true,
+					repositoryUrl: 'git@github.com:user/repo.git',
+					branchName: 'main',
+					branchReadOnly: false,
+					branchColor: '#5296D6',
+					initRepo: false,
+					keyGeneratorType: 'ed25519',
+				});
 
 				const gitService = new SourceControlGitService(mock(), mock(), mockPreferencesService);
 
@@ -154,6 +165,17 @@ describe('SourceControlGitService', () => {
 
 				// Mock the getPrivateKeyPath to return a path with spaces
 				mockPreferencesService.getPrivateKeyPath.mockResolvedValue(privateKeyPath);
+				// Mock getPreferences to return SSH connection type
+				mockPreferencesService.getPreferences.mockReturnValue({
+					connectionType: 'ssh',
+					connected: true,
+					repositoryUrl: 'git@github.com:user/repo.git',
+					branchName: 'main',
+					branchReadOnly: false,
+					branchColor: '#5296D6',
+					initRepo: false,
+					keyGeneratorType: 'ed25519',
+				});
 
 				const gitService = new SourceControlGitService(mock(), mock(), mockPreferencesService);
 
@@ -187,6 +209,17 @@ describe('SourceControlGitService', () => {
 
 				// Mock the getPrivateKeyPath to return a path with quotes
 				mockPreferencesService.getPrivateKeyPath.mockResolvedValue(pathWithQuotes);
+				// Mock getPreferences to return SSH connection type
+				mockPreferencesService.getPreferences.mockReturnValue({
+					connectionType: 'ssh',
+					connected: true,
+					repositoryUrl: 'git@github.com:user/repo.git',
+					branchName: 'main',
+					branchReadOnly: false,
+					branchColor: '#5296D6',
+					initRepo: false,
+					keyGeneratorType: 'ed25519',
+				});
 
 				const gitService = new SourceControlGitService(mock(), mock(), mockPreferencesService);
 

packages/cli/src/environments.ee/source-control/__tests__/source-control-https.service.ee.test.ts

@@ -4,16 +4,17 @@ import { SourceControlGitService } from '../source-control-git.service.ee';
 import type { SourceControlPreferencesService } from '../source-control-preferences.service.ee';
 import type { SourceControlPreferences } from '../types/source-control-preferences';
 
-// Mock simple-git
 const mockSimpleGit = {
-	env: jest.fn().mockReturnThis(),
+	env: jest.fn(),
 	init: jest.fn().mockResolvedValue(undefined),
 	addRemote: jest.fn().mockResolvedValue(undefined),
 	getRemotes: jest.fn().mockResolvedValue([]),
 };
 
+mockSimpleGit.env.mockReturnValue(mockSimpleGit);
+
 jest.mock('simple-git', () => ({
-	simpleGit: jest.fn().mockImplementation(() => mockSimpleGit),
+	simpleGit: jest.fn().mockReturnValue(mockSimpleGit),
 }));
 
 describe('SourceControlGitService - HTTPS functionality', () => {
@@ -37,34 +38,34 @@ describe('SourceControlGitService - HTTPS functionality', () => {
 
 		jest.spyOn(sourceControlPreferencesService, 'getPreferences').mockReturnValue(mockPreferences);
 		jest.clearAllMocks();
+
+		mockSimpleGit.env.mockReturnValue(mockSimpleGit);
 	});
 
 	afterEach(() => {
-		jest.resetAllMocks();
+		mockSimpleGit.env.mockClear();
+		mockSimpleGit.init.mockClear();
+		mockSimpleGit.addRemote.mockClear();
+		mockSimpleGit.getRemotes.mockClear();
 	});
 
 	describe('setGitSshCommand', () => {
 		it('should configure git for HTTPS without SSH command', async () => {
-			// Act
 			await sourceControlGitService.setGitSshCommand();
 
-			// Assert
 			expect(mockSimpleGit.env).toHaveBeenCalledWith('GIT_TERMINAL_PROMPT', '0');
 			expect(mockSimpleGit.env).not.toHaveBeenCalledWith('GIT_SSH_COMMAND', expect.any(String));
 		});
 
 		it('should configure git for SSH with SSH command when connectionType is ssh', async () => {
-			// Arrange
 			const sshPreferences = { ...mockPreferences, connectionType: 'ssh' as const };
 			jest.spyOn(sourceControlPreferencesService, 'getPreferences').mockReturnValue(sshPreferences);
 			jest
 				.spyOn(sourceControlPreferencesService, 'getPrivateKeyPath')
 				.mockResolvedValue('/path/to/key');
 
-			// Act
 			await sourceControlGitService.setGitSshCommand('/git/folder', '/ssh/folder');
 
-			// Assert
 			expect(sourceControlPreferencesService.getPrivateKeyPath).toHaveBeenCalled();
 			expect(mockSimpleGit.env).toHaveBeenCalledWith('GIT_TERMINAL_PROMPT', '0');
 			expect(mockSimpleGit.env).toHaveBeenCalledWith(
@@ -76,11 +77,9 @@ describe('SourceControlGitService - HTTPS functionality', () => {
 
 	describe('URL normalization logic', () => {
 		it('should normalize HTTPS URLs for comparison', () => {
-			// Arrange
 			const remoteWithCredentials = 'https://user:token@github.com/user/repo.git';
 			const inputWithoutCredentials = 'https://github.com/user/repo.git';
 
-			// Act - simulate the URL normalization logic from hasRemoteConfigured
 			const normalizeUrl = (url: string) => {
 				try {
 					const urlObj = new URL(url);
@@ -95,15 +94,12 @@ describe('SourceControlGitService - HTTPS functionality', () => {
 			const normalizedRemote = normalizeUrl(remoteWithCredentials);
 			const normalizedInput = normalizeUrl(inputWithoutCredentials);
 
-			// Assert
 			expect(normalizedRemote).toBe(normalizedInput);
 		});
 
 		it('should handle malformed URLs gracefully', () => {
-			// Arrange
 			const malformedUrl = 'not-a-valid-url';
 
-			// Act
 			const normalizeUrl = (url: string) => {
 				try {
 					const urlObj = new URL(url);
@@ -117,28 +113,24 @@ describe('SourceControlGitService - HTTPS functionality', () => {
 
 			const result = normalizeUrl(malformedUrl);
 
-			// Assert
 			expect(result).toBe(malformedUrl); // Should return original when URL parsing fails
 		});
 	});
 
 	describe('URL encoding in repository initialization', () => {
 		it('should properly encode credentials with special characters', () => {
-			// Arrange
 			const mockCredentials = {
 				username: 'user@domain.com',
 				password: 'p@ssw0rd!',
 			};
 
 			const baseUrl = 'https://github.com/user/repo.git';
 
-			// Act - simulate the URL encoding logic from initRepository
 			const urlObj = new URL(baseUrl);
 			urlObj.username = encodeURIComponent(mockCredentials.username);
 			urlObj.password = encodeURIComponent(mockCredentials.password);
 			const encodedUrl = urlObj.toString();
 
-			// Assert - URL constructor automatically encodes some characters but not all
 			expect(encodedUrl).toContain('user%40domain.com');
 			expect(encodedUrl).toContain('p%40ssw0rd');
 			expect(encodedUrl).toMatch(
@@ -155,24 +147,20 @@ describe('SourceControlGitService - HTTPS functionality', () => {
 
 			const baseUrl = 'https://github.com/user/repo.git';
 
-			// Act
 			const urlObj = new URL(baseUrl);
 			urlObj.username = encodeURIComponent(mockCredentials.username);
 			urlObj.password = encodeURIComponent(mockCredentials.password);
 			const encodedUrl = urlObj.toString();
 
-			// Assert
 			expect(encodedUrl).toBe('https://testuser:testtoken123@github.com/user/repo.git');
 		});
 	});
 
 	describe('Connection type handling', () => {
 		it('should differentiate between SSH and HTTPS configuration', () => {
-			// Arrange
 			const httpsPrefs = { connectionType: 'https' as const };
 			const sshPrefs = { connectionType: 'ssh' as const };
 
-			// Act & Assert
 			expect(httpsPrefs.connectionType).toBe('https');
 			expect(sshPrefs.connectionType).toBe('ssh');
 			expect(httpsPrefs.connectionType !== sshPrefs.connectionType).toBe(true);