ref(doc_spec): final tweaks

Author: duncdrum

cypress/integration/04_document_spec.js

@@ -7,8 +7,6 @@ context.only('Document Operations', () => {
       cy.visit('/')
       cy.get(`[node-id=${CSS.escape('admin@' + Cypress.env('API_HOST'))}]`)
         .should('be.visible')
-      // TODO(DP): might have to improve by adding more before / after hooks to prevent dangling documents
-      // see #400
     })
 
     after(() => {
@@ -58,9 +56,15 @@ context.only('Document Operations', () => {
         cy.get('.ReactVirtualized__Grid')
           .should('be.visible')
           .contains('untitled-1')
+        // (DP) cleanup welcome tab so we don't have to deal with it in later tests
+        cy.get('#shell-tab-fusion-welcome > .p-TabBar-tabCloseIcon')
+          .click()
+        cy.get('#shell-tab-fusion-welcome')
+          .should('not.exist')
+
 
         // TODO(DP):
-        // - add test for #413 : change order, remove workaround, might need a call to focused()
+        // - add test for #413 : remove workaround
         // - check if tree view is deselected (it is but need not be), 
         // - check if Explorer is updated properly (seems inconsistent need to double click)
         // - check if editor window is opening the newly create doc in a new tab (it doesn't)
@@ -83,12 +87,41 @@ context.only('Document Operations', () => {
           cy.get('.view-line')
             .type('asdf{ctrl+s}')
         }
+        // (DP): see #525 close edited editor pane
+        cy.get('#theia-main-content-panel > .p-TabBar > .p-TabBar-content-container > .p-TabBar-content')
+          .within(() => {
+            cy.get('.p-TabBar-tabCloseIcon')
+              .click({ multiple: true })
+          })
+        cy.get('.main')
+          .click()
+        cy.get('.view-lines')
+          .should('not.exist')
+        cy.get('[node-id$=untitled-1]')
+          .should('exist')
+        cy.get('[node-id$=untitled-2]')
+          .should('not.exist')
       })
 
-      // (DP): TODO
-      it.skip('should not loose edits on closing', () => {
+      it.skip('should load previously stored document', () => {
         cy.get('.fusion-item')
           .should('be.visible')
+        cy.get('[node-id$=untitled-1]')
+          .dblclick()
+        cy.get('.view-lines')
+          .should('exist')
+          .contains('asdf')
+        cy.get('#theia-main-content-panel > .p-TabBar > .p-TabBar-content-container > .p-TabBar-content')
+          .within(() => {
+            cy.get('.p-TabBar-tabCloseIcon')
+              .click({ multiple: true })
+          })
+        cy.get('.main')
+          .click()
+        cy.get('[node-id$=untitled-1]')
+          .should('exist')
+        cy.get('[node-id$=untitled-2]')
+          .should('not.exist')
       })
 
       it('should display document properties', () => {
@@ -115,37 +148,103 @@ context.only('Document Operations', () => {
           .should('contain.text', 'user')
         cy.get('.secondary')
           .click()
+        cy.get('[node-id$=untitled-1]')
+          .should('exist')
+      })
+
+      it('should not create duplicate documents', () => {
+        cy.get('[node-id$=db]')
+          .should('be.visible')
+          .rightclick()
+          .then(() => {
+            cy.get('.p-Menu')
+              .should('be.visible')
+              .contains('New document')
+              .trigger('mousemove')
+            cy.get('[data-command="fusion.new-document"] > .p-Menu-itemLabel')
+              .should('be.visible')
+              .click()
+            cy.get('.fs-inline-input > .theia-input')
+              .clear()
+              .type('untitled-1{enter}')
+            cy.get('.error')
+              .should('exist')
+              .should('contain.text', 'Item already exists')
+            cy.get('[node-id$=untitled-1]')
+              .should('exist')
+          })
+      })
+
+      it('should let users delete documents', () => {
+        cy.get('[node-id$=untitled-1]')
+          .should('be.visible')
+          .rightclick()
+        cy.get('[data-command="fusion.delete"] > .p-Menu-itemLabel')
+          .should('be.visible')
+          .click()
+        cy.get('.main')
+          .click()
+        cy.get('[node-id$=db]')
+          .should('be.visible')
+        cy.get('[node-id$=untitled-1]')
+          .should('not.exist')
       })
 
       // see #414 workaround is to run this after editing and saving the document, 
       // we should be able to rename before editing content
-      it('should let users rename documents', () => {
+      it.skip('should let users rename documents', () => {
         cy.get('.fusion-item')
           .should('exist')
-        // (DP) rename untitled-1 -> test.txt
+        // (DP) rename untitled-1 -> test.xml
         cy.get('[node-id$=untitled-1]')
           .should('be.visible')
-          // (DP) press F2 not working
+          // (DP) press F2 not working see #526
           // .trigger('keydown', { keyCode: 112, which: 112 })
           // .trigger('keyup', { keyCode: 112, which: 112 })
           // (DP) see #522
           .rightclick({ force: true })
-          // (DP) note to self: the problem is that the editor window remains open from previous runs, 
-          // so there is untitled-1 there after the rename, we need to close it, without interferring with the 
-          // logic of the first run, or just declare this test green because yolo
         cy.get('[data-command="fusion.rename"] > .p-Menu-itemLabel')
           .should('be.visible')
           .click()
           .focused()
+          .clear()
           .type('test.txt{enter}', { force: true })
-        cy.get('[node-id$=test\\.txt]')
-          .should('be.visible')
-        // DP see #414 activate to confirm fix 
+        // (DP): see #414 here the funkyness starts instead of having renamed the first file upon hitting {enter}
+        // - we now have 2 files in the db tree untitled-1 and test.txt, there should only be 1 => test.txt
+        // - test.txt isn't really renamed as its contents are empty, it should have the contents previously stored as untitled-1
+        // - uncomment the following to test any potential fixes
         // cy.get('[node-id$=untitled-1]')
-        // .should('not.exist')  
+        //   .should('not.exist')
+
+        // (DP): failed workaround which needs to include a subworkaround but ultimately fails due to #527
+        // cy.get('.ReactVirtualized__Grid')
+        //   .then(() => {
+        //     cy.get('[node-id$=test\\.txt]')
+        //       .dblclick()
+        //   })
+        // if (Cypress.platform === 'darwin') {
+        //   cy.get('.view-line')
+        //     .type('fdsa{meta+s}')
+        // } else {
+        //   cy.get('.view-line')
+        //     .type('fdsa{ctrl+s}')
+        // }
+        // // (DP): subworkaround #525 close edited editor pane
+        // cy.get('#theia-main-content-panel > .p-TabBar > .p-TabBar-content-container > .p-TabBar-content')
+        //   .within(() => {
+        //     cy.get('.p-TabBar-tabCloseIcon')
+        //       .click({ multiple: true })
+        //   })
+        // cy.get('.main')
+        //   .click()
+        // (DP): end workarounds #414 #525 #527
+
+        // (DP): if #414 is fixed the below needs to be activated
+        // cy.get('[node-id$=test\\.txt]')
+        //   .should('be.visible')
       })
 
-      it('should not create duplicate documents', () => {
+      it.skip('should not create duplicate documents', () => {
         cy.get('[node-id$=db]')
           .should('be.visible')
           .rightclick()
@@ -169,7 +268,7 @@ context.only('Document Operations', () => {
           })
       })
 
-      it('should let users delete documents', () => {
+      it.skip('should let users delete documents', () => {
         cy.get('[node-id$=test\\.txt]')
           .should('be.visible')
           .rightclick()
@@ -178,7 +277,6 @@ context.only('Document Operations', () => {
           .click()
         cy.get('.main')
           .click()
-        // make sure all test files are gone see #400
         cy.get('[node-id$=db]')
           .should('be.visible')
         cy.get('[node-id$=test\\.txt]')

cypress/support/index.js

@@ -16,7 +16,8 @@
 // Import commands.js using ES2015 syntax:
 import './commands'
 
-// (DP) workaround for #517 this needs to go.   
+// (DP) workaround for #517 this needs to go. 
+// https://docs.cypress.io/api/events/catalog-of-events#Uncaught-Exceptions
 Cypress.on('uncaught:exception', (err, runnable) => {
     if (err.message.includes('filesystem provider')) {
       return false