Resolve conflicts

Author: pippo-sci

cypress/integration/Student.spec.js

@@ -16,21 +16,21 @@ describe('user student E2E', () =>{
         cy.contains("Some files are missing").parent().find('button').click()
         //Upload files
         cy.fixture('./demoData/Blockworld_domain_normal.pddl').then(fileContent => {
-            cy.get('input[type="file"]').attachFile({
+            cy.contains('Domain File').parent().parent().parent().find('input[type="file"]').attachFile({
                 fileContent: fileContent.toString(),
                 fileName: 'Blockworld_domain_normal.pddl',
                 mimeType: 'file'
             });
         });
         cy.fixture('./demoData/Blockworld_problem_normal.pddl').then(fileContent => {
-            cy.contains('Problem File').parentsUntil('div').parent().find('input[type="file"]').attachFile({
+            cy.contains('Problem File').parent().parent().parent().find('input[type="file"]').attachFile({
                 fileContent: fileContent.toString(),
                 fileName: 'Blockworld_problem_normal.pddl',
                 mimeType: 'file'
             });
         });
         cy.fixture('./demoData/Blocksworld_AP.pddl').then(fileContent => {
-            cy.contains('Animation File').parentsUntil('div').parent().find('input[type="file"]').attachFile({
+            cy.contains('Animation File').parent().parent().parent().find('input[type="file"]').attachFile({
                 fileContent: fileContent.toString(),
                 fileName: 'Blocksworld_AP.pddl',
                 mimeType: 'file'
@@ -42,6 +42,6 @@ describe('user student E2E', () =>{
         cy.contains('Upload Files').click()
         cy.wait(5000)
 
-        cy.get('div[style="height: 50px;"]').should("be.visible")
+        cy.get('canvas').should("be.visible")
     })
 })

package-lock.json

@@ -4338,6 +4338,11 @@ cyclist@^1.0.1:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
   integrity sha1-WW6WmP0MgOEgOMK4LW6xs1tiJNk=
 
+cypress-file-upload@^5.0.8:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/cypress-file-upload/-/cypress-file-upload-5.0.8.tgz#d8824cbeaab798e44be8009769f9a6c9daa1b4a1"
+  integrity sha512-+8VzNabRk3zG6x8f8BWArF/xA/W0VK4IZNx3MV0jFWrJS/qKn8eHfa5nU73P9fOQAgwHFJx7zjg4lwOnljMO8g==
+
 cypress@^8.6.0:
   version "8.6.0"
   resolved "https://registry.yarnpkg.com/cypress/-/cypress-8.6.0.tgz#8d02fa58878b37cfc45bbfce393aa974fa8a8e22"