test: handle cleanup data cypress

README.md

@@ -164,20 +164,3 @@ SEEDING=true docker compose -f docker-compose.e2e.yml up -d --build
    ```bash
    yarn test:open-cypress
    ```
-
-### Cypress Architecture
-
-Structure in E2E folder:
-
-- Cypress Configuration:
-  - `cypress.config.js`: Contains the configuration for Cypress.
-  - `tsconfig.json`: Contains the TypeScript configuration for Cypress.
-  - `package.json`: Contains the scripts and library for running Cypress.
-- Test Files:
-  - Tests are organized under cypress/e2e/ . For example:
-    - cypress/e2e/issue_workflow_test/DFR/ for DFR related tests.
-- Support Files:
-  - `e2e.ts`: Contains custom commands for Cypress.
-  - `index.ts`: Contains the setup for Cypress.
-- Fixtures:
-  - JSON files for test data are stored in cypress/fixtures/.

docker-compose.e2e.yml

@@ -144,7 +144,7 @@ services:
       context: .
       dockerfile: Dockerfile
       args:
-        CONFIG_FILE: ./cypress/fixtures/app-config.json
+        CONFIG_FILE: ./e2e/cypress/fixtures/app-config.json
     ports:
       - '3003:80'
 

e2e/README.md

@@ -0,0 +1,21 @@
+
+### Cypress Architecture
+
+Structure in E2E folder:
+
+- Cypress Configuration:
+  - `cypress.config.js`: Contains the configuration for Cypress.
+  - `tsconfig.json`: Contains the TypeScript configuration for Cypress.
+  - `package.json`: Contains the scripts and libraries for running Cypress.
+- Test Files:
+  - Tests are organized under cypress/e2e/ . For example:
+    - cypress/e2e/issue_workflow_test/DFR/ for DFR related tests.
+- Support Files:
+  - `e2e.ts`: Contains custom commands for Cypress.
+  - `index.ts`: Contains the setup for Cypress.
+- Fixtures:
+  - JSON files for test data are stored in cypress/fixtures/.
+
+### Clean up data
+
+Currently, the E2E tests clean up the data by deleting the Minio folder, which is bind-mounted from the Docker Compose file. 

e2e/cypress.config.ts

@@ -34,16 +34,30 @@ export default defineConfig({
             throw error;
           }
         },
-        deleteFileCredentialE2E(fileName: string) {
-          const filePath = path.resolve('cypress/fixtures/credentials-e2e', fileName);
-          return new Promise((resolve, reject) => {
-            fs.unlink(filePath, (err) => {
-              if (err) {
-                return reject(err);
-              }
-              resolve(null);
-            });
-          });
+        resetData(file?: string) {
+
+          const targetDir = path.resolve(
+            process.cwd(),
+            `../minio_data/identity-resolver-service-object-store/data-test/idr-bucket-1/gs1${file ? `/${file}` : ''}`
+          );
+
+          if (fs.existsSync(targetDir)) {
+            console.log(`Found folder: ${targetDir}`);
+            console.log('Deleting folder...');
+
+            fs.rmdirSync(targetDir, { recursive: true });
+
+            if (!fs.existsSync(targetDir)) {
+              console.log('Folder deleted successfully.');
+              return { success: true };
+            } else {
+              console.log('Failed to delete the folder.');
+              return { success: false };
+            }
+          } else {
+            console.log(`Folder not found: ${targetDir}`);
+            return { success: true };
+          }
         },
         async runUntpTest({ type, version, testData }) {
           const { testCredentialHandler } = await import('untp-test-suite/src/interfaces/lib/testSuiteHandler');

e2e/cypress/e2e/issue_workflow_test/DCC/issueDCC.cy.ts

@@ -6,7 +6,6 @@ class DCCIssueFlow extends IssuePage {
       'General features',
       'Generate DCC',
       'getConformityCredential',
-      'DigitalConformityCredential_instance-v0.5.0.json',
       'generalFeatures',
     );
   }

e2e/cypress/e2e/issue_workflow_test/DFR/issueDFR.cy.ts

@@ -6,7 +6,6 @@ class DFRIssueFlow extends IssuePage {
       'General features',
       'Generate DFR',
       'DigitalFacilityRecord',
-      'DigitalFacilityRecord_instance-v0.5.0.json',
       'generalFeatures',
     );
   }

e2e/cypress/e2e/issue_workflow_test/DIA/issueDIA.cy.ts

@@ -6,7 +6,6 @@ class DIAIssueFlow extends IssuePage {
       'General features',
       'Generate DIA',
       'DigitalIdentityAnchor',
-      'DigitalIdentityAnchor_instance-v0.2.1.json',
       'generalFeatures',
     );
   }

e2e/cypress/e2e/issue_workflow_test/DPP/issueDPP.cy.ts

@@ -6,7 +6,6 @@ class DPPIssueFlow extends IssuePage {
       'Orchard Facility',
       'Issue DPP',
       'DigitalProductPassport',
-      'DigitalProductPassport_instance-v0.5.0.json',
       'apps',
     );
   }