diff options
author | Gökay Şatır <gokaysatir@gmail.com> | 2023-08-11 17:47:29 +0300 |
---|---|---|
committer | Gökay ŞATIR <gokaysatir@gmail.com> | 2023-08-14 14:24:46 +0300 |
commit | 3d1725ea448b85ea22f74dab8377e8e0384439cd (patch) | |
tree | 274c274c4f6a63cc7267aa8552df4e2091b9884f /cypress_test/integration_tests/desktop | |
parent | Update cypress tests. (diff) | |
download | online-3d1725ea448b85ea22f74dab8377e8e0384439cd.tar.gz online-3d1725ea448b85ea22f74dab8377e8e0384439cd.zip |
Cypress updates.
Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ieefdcae70be0fce920e2e2b3d3b6ba1b179a6857
Diffstat (limited to 'cypress_test/integration_tests/desktop')
-rw-r--r-- | cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js | 12 | ||||
-rw-r--r-- | cypress_test/integration_tests/desktop/impress/annotation_spec.js | 30 |
2 files changed, 16 insertions, 26 deletions
diff --git a/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js b/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js index 3b683f86f3..ef937af35a 100644 --- a/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js +++ b/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js @@ -21,40 +21,40 @@ describe(['tagdesktop'], 'Row Column Operation', function() { it('Insert/Delete row' , function() { //Insert row above - cy.cGet('.cell.notebookbar #InsertColumnsBeforeimg').click(); + cy.cGet('.cell.notebookbar #InsertColumnsBefore').click(); calcHelper.selectEntireSheet(); //calcHelper.assertDataClipboardTable(['','','Hello','Hi','World','Bye']); //delete row calcHelper.clickOnFirstCell(true, false); - cy.cGet('.cell.notebookbar #DeleteRowsimg').click(); + cy.cGet('.cell.notebookbar #DeleteRows').click(); calcHelper.selectEntireSheet(); //calcHelper.assertDataClipboardTable(['Hello','Hi','World','Bye']); //insert row below calcHelper.clickOnFirstCell(true, false); - cy.cGet('.cell.notebookbar #InsertRowsAfterimg').click(); + cy.cGet('.cell.notebookbar #InsertRowsAfter').click(); calcHelper.selectEntireSheet(); //calcHelper.assertDataClipboardTable(['Hello','Hi','','','World','Bye']); }); it('Insert/Delete Column', function() { //insert column before - cy.cGet('.cell.notebookbar #InsertColumnsBeforeimg').click(); + cy.cGet('.cell.notebookbar #InsertColumnsBefore').click(); calcHelper.selectEntireSheet(); //calcHelper.assertDataClipboardTable(['','Hello','Hi','','World','Bye']); calcHelper.clickOnFirstCell(true, false); //delete column - cy.cGet('.cell.notebookbar #DeleteColumnsimg').click(); + cy.cGet('.cell.notebookbar #DeleteColumns').click(); calcHelper.selectEntireSheet(); cy.wait(500); //calcHelper.assertDataClipboardTable(['Hello','Hi','World','Bye']); calcHelper.clickOnFirstCell(true,false); //insert column after - cy.cGet('.cell.notebookbar #InsertColumnsAfterimg').click(); + cy.cGet('.cell.notebookbar #InsertColumnsAfter').click(); calcHelper.selectEntireSheet(); //calcHelper.assertDataClipboardTable(['Hello','','Hi','World','','Bye']); }); diff --git a/cypress_test/integration_tests/desktop/impress/annotation_spec.js b/cypress_test/integration_tests/desktop/impress/annotation_spec.js index b4c0bcc6eb..c3d66bb9c6 100644 --- a/cypress_test/integration_tests/desktop/impress/annotation_spec.js +++ b/cypress_test/integration_tests/desktop/impress/annotation_spec.js @@ -16,12 +16,9 @@ describe(['tagdesktop'], 'Annotation Tests', function() { if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.hideSidebarIfVisible(); - } else if (Cypress.env('USER_INTERFACE') === 'notebookbar') { - cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click(); - } else { - desktopHelper.hideSidebar(); } + cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click(); desktopHelper.selectZoomLevel('50'); }); @@ -78,12 +75,9 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() { if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.hideSidebarIfVisible(); - } else if (Cypress.env('USER_INTERFACE') === 'notebookbar') { - cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click(); - } else { - desktopHelper.hideSidebar(); } + cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click(); desktopHelper.selectZoomLevel('50'); }); @@ -92,13 +86,13 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() { }); it('Insert', function() { - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); cy.cGet('.leaflet-marker-icon').should('exist'); cy.cGet('.cool-annotation-content > div').should('contain','some text'); }); it('Modify', function() { - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); cy.cGet('.leaflet-marker-icon').should('exist'); cy.cGet('#annotation-content-area-1').should('contain','some text0'); cy.cGet('.avatar-img').click(); @@ -112,7 +106,7 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() { }); it('Remove',function() { - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); cy.cGet('.leaflet-marker-icon').should('exist'); cy.cGet('.cool-annotation-content > div').should('contain','some text'); cy.cGet('.avatar-img').click(); @@ -122,7 +116,7 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() { }); it('Reply',function() { - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); cy.cGet('.leaflet-marker-icon').should('exist'); cy.cGet('.cool-annotation-content > div').should('contain','some text'); cy.cGet('.avatar-img').click(); @@ -142,11 +136,7 @@ describe(['tagdesktop'], 'Comment Scrolling',function() { testFileName = helper.beforeAll(origTestFileName, 'impress'); desktopHelper.switchUIToNotebookbar(); - if (Cypress.env('USER_INTERFACE') === 'notebookbar') { - cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click(); - } else { - desktopHelper.hideSidebar(); - } + cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click(); desktopHelper.selectZoomLevel('50'); }); @@ -156,15 +146,15 @@ describe(['tagdesktop'], 'Comment Scrolling',function() { it('no comment or one comment', function() { cy.cGet('.leaflet-control-scroll-down').should('not.exist'); - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); cy.cGet('.leaflet-marker-icon').should('exist'); }); it('omit slides without comments', function() { //scroll up - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); addSlide(2); - insertMultipleComment('impress', 1, false); + insertMultipleComment('impress'); helper.waitUntilIdle('.leaflet-control-scroll-up'); cy.cGet('.leaflet-control-scroll-up').should('be.visible'); cy.cGet('.leaflet-control-scroll-up').click().wait(300); |