Fix test failure due to changes and fix CI

Signed-off-by: Sagar <[email protected]>
nextcloud · Oct 16, 2024 · c1d0cc6 · c1d0cc6
1 parent 79ed572
commit c1d0cc6
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/lib/Service/OpenProjectAPIService.php b/lib/Service/OpenProjectAPIService.php
@@ -33,6 +33,7 @@
 use OCA\TermsOfService\Db\Mapper\TermsMapper;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
+use OCP\Encryption\IManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
@@ -56,7 +57,6 @@
 use OCP\Security\ISecureRandom;
 use OCP\Server;
 use Psr\Log\LoggerInterface;
-use OCP\Encryption\IManager;
 
 define('CACHE_TTL', 3600);
 

diff --git a/src/components/AdminSettings.vue b/src/components/AdminSettings.vue
@@ -264,7 +264,7 @@
 						:project-folder-set-up-error="state.project_folder_info.errorMessage" />
 					<NcNoteCard v-else-if="showEncryptionWarningForGroupFolders" class="note-card" type="warning">
 						<p><b>Encryption for Group Folders are not enabled.</b></p>
-						<p class="note-card--info" v-html="getGroupFolderEncryptionWarningHint"></p> <!-- eslint-disable-line vue/no-v-html -->
+						<p class="note-card--info" v-html="getGroupFolderEncryptionWarningHint" /> <!-- eslint-disable-line vue/no-v-html -->
 					</NcNoteCard>
 					<div class="form-actions">
 						<NcButton
@@ -581,10 +581,10 @@ export default {
 		},
 		showEncryptionWarningForGroupFolders() {
 			if (!this.isProjectFolderAlreadySetup || !this.state.app_password_set || this.isProjectFolderSetupFormInEdit) {
-				return false;
+				return false
 			}
 			return this.state.encryption_info.server_side_encryption_enabled
-				&& !this.state.encryption_info.encryption_enabled_for_groupfolders;
+				&& !this.state.encryption_info.encryption_enabled_for_groupfolders
 		},
 	},
 	created() {

diff --git a/tests/jest/components/AdminSettings.spec.js b/tests/jest/components/AdminSettings.spec.js
@@ -1167,6 +1167,10 @@ describe('AdminSettings.vue', () => {
 									},
 									fresh_project_folder_setup: true,
 									app_password_set: false,
+									encryption_info: {
+										server_side_encryption_enabled: false,
+										encryption_enabled_for_groupfolders: false,
+									},
 								},
 								isGroupFolderAlreadySetup: null,
 							})
@@ -1245,6 +1249,10 @@ describe('AdminSettings.vue', () => {
 									status: true,
 								},
 								app_password_set: true,
+								encryption_info: {
+									server_side_encryption_enabled: false,
+									encryption_enabled_for_groupfolders: false,
+								},
 							},
 						})
 						await wrapper.setData({
@@ -1373,6 +1381,10 @@ describe('AdminSettings.vue', () => {
 									status: true,
 								},
 								app_password_set: true,
+								encryption_info: {
+									server_side_encryption_enabled: false,
+									encryption_enabled_for_groupfolders: false,
+								},
 							},
 							isGroupFolderAlreadySetup: null,
 						})

diff --git a/tests/lib/Service/OpenProjectAPIServiceTest.php b/tests/lib/Service/OpenProjectAPIServiceTest.php
@@ -26,6 +26,7 @@
 use OCA\TermsOfService\Db\Mapper\SignatoryMapper;
 use OCP\App\IAppManager;
 use OCP\AppFramework\Http;
+use OCP\Encryption\IManager;
 use OCP\EventDispatcher\IEventDispatcher;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
@@ -747,7 +748,8 @@ private function getOpenProjectAPIService(
 			$this->createMock(IEventDispatcher::class),
 			$this->createMock(ISubAdmin::class),
 			$this->createMock(IDBConnection::class),
-			$this->createMock(ILogFactory::class)
+			$this->createMock(ILogFactory::class),
+			$this->createMock(IManager::class),
 		);
 	}
 
@@ -765,6 +767,7 @@ private function getOpenProjectAPIService(
 	 * @param IDBConnection|null $db
 	 * @param IURLGenerator|null $iURLGenerator
 	 * @param ILogFactory|null $iLogFactory
+	 * @param IManager|null $iManager
 	 * @return OpenProjectAPIService|MockObject
 	 */
 	private function getServiceMock(
@@ -780,6 +783,7 @@ private function getServiceMock(
 		$tokenProviderMock = null,
 		$db = null,
 		$iLogFactory = null,
+		$iManager = null,
 		$iURLGenerator = null
 	): OpenProjectAPIService {
 		$onlyMethods[] = 'getBaseUrl';
@@ -819,6 +823,9 @@ private function getServiceMock(
 		if ($iLogFactory === null) {
 			$iLogFactory = $this->createMock(ILogFactory::class);
 		}
+		if ($iManager === null) {
+			$iManager = $this->createMock(IManager::class);
+		}
 		$mock = $this->getMockBuilder(OpenProjectAPIService::class)
 			->setConstructorArgs(
 				[
@@ -840,6 +847,7 @@ private function getServiceMock(
 					$subAdminManagerMock,
 					$db,
 					$iLogFactory,
+					$iManager,
 					$iURLGenerator
 				])
 			->onlyMethods($onlyMethods)
@@ -2106,8 +2114,8 @@ public function testRequestConnectException(
 			$this->createMock(IEventDispatcher::class),
 			$this->createMock(ISubAdmin::class),
 			$this->createMock(IDBConnection::class),
-			$this->createMock(ILogFactory::class)
-
+			$this->createMock(ILogFactory::class),
+			$this->createMock(IManager::class),
 		);
 
 		$response = $service->request('', '', []);
@@ -2177,7 +2185,8 @@ public function testRequestClientServerException(
 			$this->createMock(IEventDispatcher::class),
 			$this->createMock(ISubAdmin::class),
 			$this->createMock(IDBConnection::class),
-			$this->createMock(ILogFactory::class)
+			$this->createMock(ILogFactory::class),
+			$this->createMock(IManager::class)
 		);
 
 		$response = $service->request('', '', []);
@@ -3395,6 +3404,7 @@ public function testGetAvailableOpenProjectProjectsQueryOnly() {
 			null,
 			null,
 			null,
+			null,
 			$iUrlGeneratorMock
 		);
 		$service->method('request')
@@ -3773,6 +3783,7 @@ public function testGetWorkPackageInfoForExistentWorkPackage(): void {
 			null,
 			null,
 			null,
+			null,
 			$iULGeneratorMock
 		);
 		$imageURL = 'http://nextcloud/server/index.php/apps/integration_openproject/avatar?userId=3&userName=OpenProject Admin';