Fix tests

eea · Jul 5, 2021 · 65177e9 · 65177e9
1 parent cbd8d34
commit 65177e9
Show file tree

Hide file tree

Showing 6 changed files with 114 additions and 66 deletions.
diff --git a/cypress/helpers/actions/index.js b/cypress/helpers/actions/index.js
@@ -0,0 +1,22 @@
+export const save = (path) => {
+  cy.url().then(($url) => {
+    if ($url.includes(path)) {
+      //cy.get('.ui.button.save').click();
+      cy.get('#toolbar-save').click();
+      cy.url().should('eq', Cypress.config().baseUrl + path);
+    } else {
+      cy.log('Wrong path');
+    }
+  });
+};
+
+export const cancel = (path) => {
+  cy.url().then(($url) => {
+    if ($url.includes(path)) {
+      cy.get('.ui.button.cancel').click();
+      cy.url().should('eq', Cypress.config().baseUrl + path);
+    } else {
+      cy.log('Wrong path');
+    }
+  });
+};
diff --git a/cypress/helpers/blocks/index.js b/cypress/helpers/blocks/index.js
@@ -1,20 +1,46 @@
 import { openSidebar, closeSidebar } from '../index';
 
-export const changePageTitle = (title) => {
+export const changePageTitle = (title, delay = 10) => {
   cy.get('.documentFirstHeading > .public-DraftStyleDefault-block')
     .clear()
     .type(title)
     .get('.documentFirstHeading span[data-text]')
     .contains(title);
+
+  cy.get('.documentFirstHeading > .public-DraftStyleDefault-block').type(
+    '{enter}',
+  );
 };
 
 export const addBlock = (groupTitle, groupId, blockId) => {
   closeSidebar();
-  cy.get('.ui.basic.icon.button.block-add-button').first().click();
-  cy.get('.blocks-chooser .title').contains(groupTitle).click();
-  cy.get(`.content.active.${groupId} .button.${blockId}`).click();
-  cy.get(`#page-edit div.block-editor-${blockId}`);
-  openSidebar();
+  cy.getIfExists(
+    '#page-edit div.block-editor-slate',
+    () => {
+      cy.get('#page-edit div.block-editor-slate').last().click();
+    },
+    () => {
+      cy.getIfExists('#page-edit div.block-editor-text', () => {
+        cy.get('#page-edit div.block-editor-text').last().click();
+      });
+    },
+  );
+  cy.get('.ui.basic.icon.button.block-add-button').last().click();
+  cy.getIfExists(
+    `.content.active.${groupId}`,
+    () => {
+      cy.get(`.content.active.${groupId} .button.${blockId}`).click();
+      cy.get(`#page-edit div.block-editor-${blockId}`).type('{enter}');
+      openSidebar();
+    },
+    () => {
+      cy.get('.blocks-chooser .title').contains(groupTitle).click();
+      cy.get(`.content.active.${groupId} .button.${blockId}`).click();
+      cy.get(`#page-edit div.block-editor-${blockId}`);
+      cy.get(`#page-edit div.block-editor-${blockId}`).type('{enter}');
+      openSidebar();
+    },
+  );
 };
 
 export const selectBlock = (blockId) => {

diff --git a/cypress/helpers/index.js b/cypress/helpers/index.js
@@ -1,3 +1,4 @@
-export { openSidebar, closeSidebar, openSidebarTab } from './sidebar';
-export { changePageTitle, addBlock, selectBlock } from './blocks';
-export { setInputValue, filtersModal } from './utils';
+export * from './actions';
+export * from './blocks';
+export * from './sidebar';
+export * from './utils';
diff --git a/cypress/helpers/utils.js b/cypress/helpers/utils.js
@@ -25,18 +25,6 @@ export const setInputValue = (selector, value, type = 'input') => {
   });
 };
 
-export const save = (path) => {
-  cy.url().then(($url) => {
-    if ($url.includes(path)) {
-      //cy.get('.ui.button.save').click();
-      cy.get('#toolbar-save').click();
-      cy.url().should('eq', Cypress.config().baseUrl + path);
-    } else {
-      cy.log('Wrong path');
-    }
-  });
-};
-
 export const filtersModal = {
   addFilter: (id, value) => {
     cy.get(id).click();
@@ -62,6 +50,8 @@ export const filtersModal = {
   search: (text) => {
     cy.get('.filters-container .search-input-container input').type(text);
     cy.wait(2000);
-    cy.get('.filters-container .search-input-container input').type('{enter}');
+    cy.get('.filters-container .search-input-container span.suggestion-term')
+      .contains(text)
+      .click();
   },
 };
diff --git a/cypress/integration/sites.js b/cypress/integration/sites.js
@@ -1,7 +1,7 @@
 import { setupBeforeEach, tearDownAfterEach } from '../support';
 import { changePageTitle, addBlock } from '../helpers';
 import { openSidebarTab } from '../helpers';
-import { setInputValue, filtersModal, save } from '../helpers/utils';
+import { setInputValue, filtersModal } from '../helpers/utils';
 import { tableBlockData } from '../helpers/data';
 
 describe('Sites in DiscodataTableBlock', () => {
@@ -10,48 +10,41 @@ describe('Sites in DiscodataTableBlock', () => {
 
   it('Add Blocks', () => {
     changePageTitle('Sites in DiscodataTableBlock');
-    save('/cypress/my-page');
-    cy.contains('Sites in DiscodataTableBlock');
-    // Add block
-    // addBlock('Text', 'text', 'slate');
-    // addBlock('Most used', 'most_used', 'image');
-
-    //   // addBlock('Eprtr Blocks', 'eprtr_blocks', 'eprtr_filters_block');
-    //   addBlock(
-    //     'Discodata components',
-    //     'discodata_components',
-    //     'discodata_components_table_block',
-    //   );
-    //   openSidebarTab('Block');
-    //   setInputValue(
-    //     'textarea#field-field-widget-importExport',
-    //     tableBlockData,
-    //     'textarea',
-    //   );
-    //   cy.get('textarea#field-field-widget-importExport').type(' ');
-    //   cy.get('#toolbar-save').click();
-    //   cy.wait(2000);
-    //   filtersModal.open();
-    //   filtersModal.addFilter('#countries_0', 'Romania');
-    //   filtersModal.addFilter('#reporting_years_0', '2018');
-    //   filtersModal.triggerSearch();
-    //   cy.get('.browse-table .ui.pagination.menu a:nth-last-child(2)').should(
-    //     'have.text',
-    //     '42',
-    //   );
-    //   cy.wait(2000);
-    //   filtersModal.search('Site: 101AR0000.SITE');
-    //   cy.get('.browse-table .ui.pagination.menu a:nth-last-child(2)').should(
-    //     'have.text',
-    //     '1',
-    //   );
-    //   cy.wait(2000);
-    //   cy.get(
-    //     '#page-document > div.browse-table > table > tbody > tr:nth-last-child(2) > td:nth-child(1) > p',
-    //   ).should('have.text', 'Site: 101AR0000.SITE');
-    //   filtersModal.open();
-    //   filtersModal.triggerClear();
-    //   filtersModal.triggerSearch();
-    // });
+    addBlock('Eprtr Blocks', 'eprtr_blocks', 'eprtr_filters_block');
+    addBlock(
+      'Discodata components',
+      'discodata_components',
+      'discodata_components_table_block',
+    );
+    openSidebarTab('Block');
+    setInputValue(
+      'textarea#field-field-widget-importExport',
+      tableBlockData,
+      'textarea',
+    );
+    cy.get('textarea#field-field-widget-importExport').type(' ');
+    cy.get('#toolbar-save').click();
+    cy.wait(2000);
+    filtersModal.open();
+    filtersModal.addFilter('#countries_0', 'Romania');
+    filtersModal.addFilter('#reporting_years_0', '2018');
+    filtersModal.triggerSearch();
+    cy.get('.browse-table .ui.pagination.menu a:nth-last-child(2)').should(
+      'have.text',
+      '42',
+    );
+    cy.wait(2000);
+    filtersModal.search('Site: 101AR0000.SITE');
+    cy.get('.browse-table .ui.pagination.menu a:nth-last-child(2)').should(
+      'have.text',
+      '1',
+    );
+    cy.wait(2000);
+    cy.get(
+      '#page-document > div.browse-table > table > tbody > tr:nth-last-child(2) > td:nth-child(1) > p',
+    ).should('have.text', 'Site: 101AR0000.SITE');
+    filtersModal.open();
+    filtersModal.triggerClear();
+    filtersModal.triggerSearch();
   });
 });
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
@@ -302,6 +302,20 @@ function setBaseAndExtent(...args) {
   document.getSelection().setBaseAndExtent(...args);
 }
 
+function getIfExists(
+  selector,
+  successAction = () => {},
+  failAction = () => {},
+) {
+  cy.get('body').then((body) => {
+    if (body.find(selector).length > 0 && successAction) {
+      successAction();
+    } else if (failAction) {
+      failAction();
+    }
+  });
+}
+
 Cypress.Commands.add('navigate', (route = '') => {
   return cy.window().its('appHistory').invoke('push', route);
 });
@@ -314,6 +328,8 @@ Cypress.Commands.add('settings', (key, value) => {
   return cy.window().its('settings');
 });
 
+Cypress.Commands.add('getIfExists', getIfExists);
+
 Cypress.Commands.add(
   'controlledTextAreaChange',
   { prevSubject: 'element' },