remove slate dependency, add conditional

eea · Dec 22, 2020 · 3d72f97 · 3d72f97
1 parent 0027e44
commit 3d72f97
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 11 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -5,7 +5,7 @@ pipeline {
         GIT_NAME = "volto-accordion-block"
         NAMESPACE = "@eeacms"
         SONARQUBE_TAGS = "volto.eea.europa.eu"
-        DEPENDENCIES = "@eeacms/volto-blocks-form volto-slate:asDefault"
+        DEPENDENCIES = "@eeacms/volto-blocks-form"
     }
 
   stages {

diff --git a/cypress/integration/blocks-accordion.js b/cypress/integration/blocks-accordion.js
@@ -109,14 +109,25 @@ describe('Block Tests', () => {
       .type('panel 1')
       .should('have.value', 'panel 1');
     cy.wait(1000);
-    cy.get('div.slate-editor')
-      .first()
-      .within(() => {
-        cy.get('p[data-slate-node="element"]')
-          .should('have.value', '')
-          .invoke('attr', 'tabindex', 1)
-          .type('children', { delay: 50 });
-      });
+    if (cy.find('div.slate-editor').length) {
+      cy.get('div.slate-editor')
+        .first()
+        .within(() => {
+          cy.get('p[data-slate-node="element"]')
+            .should('have.value', '')
+            .invoke('attr', 'tabindex', 1)
+            .type('children', { delay: 50 });
+        });
+    } else {
+      cy.get('div.DraftEditor-editorContainer')
+        .first()
+        .within(() => {
+          cy.get('span[data-text=true]')
+            .should('have.value', '')
+            .invoke('attr', 'tabindex', 1)
+            .type('children', { delay: 50 });
+        });
+    }
     cy.get('.accordion:nth-child(2) > .title input').click();
     cy.get('.accordion:nth-child(2) > .title input').type('panel 2');
     cy.get('.accordion:nth-child(2) > .title > .icon').click();

diff --git a/package.json b/package.json
@@ -21,8 +21,7 @@
     "release-it": "*"
   },
   "dependencies": {
-    "@eeacms/volto-blocks-form": "^1.0.0",
-    "volto-slate": "^1.0.0"
+    "@eeacms/volto-blocks-form": "^1.0.0"
   },
   "scripts": {
     "release": "release-it",