From 09aa1c17e1e7e1d77ffb17a116d399f9cf169747 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20Zolnai?= Date: Fri, 25 Sep 2020 17:20:01 +0200 Subject: [PATCH] cypress: NC: test restoring a document's previous version. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I7cabd7138dbabe870382603b5ad9d5415c9db21c Reviewed-on: https://gerrit.libreoffice.org/c/online/+/103412 Tested-by: Jenkins CollaboraOffice Reviewed-by: Tamás Zolnai --- .../data/mobile/impress/nextcloud.odp | Bin 10748 -> 10718 bytes .../common/nextcloud_helper.js | 25 +++++++++- .../mobile/calc/nextcloud_spec.js | 43 ++++++++++++++++++ .../mobile/impress/nextcloud_spec.js | 38 ++++++++++++++++ .../mobile/writer/nextcloud_spec.js | 35 ++++++++++++++ 5 files changed, 140 insertions(+), 1 deletion(-) diff --git a/cypress_test/data/mobile/impress/nextcloud.odp b/cypress_test/data/mobile/impress/nextcloud.odp index 8907786e3072c9e3a5e5f71cc6a3dad8311d14c8..bc6d853abf2597c56236feedf9f4c5c195aaec64 100644 GIT binary patch delta 8567 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 Xfd4<^Xd(8rgpi%rK;$&KKP~?SEin}m delta 8581 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 Ye#c+{fIpk~@1hB*XJmlyr2QlLe~jPCUH||9 diff --git a/cypress_test/integration_tests/common/nextcloud_helper.js b/cypress_test/integration_tests/common/nextcloud_helper.js index 304c814e95..980355d355 100644 --- a/cypress_test/integration_tests/common/nextcloud_helper.js +++ b/cypress_test/integration_tests/common/nextcloud_helper.js @@ -2,7 +2,7 @@ var mobileHelper = require('./mobile_helper'); -function checkAndCloseRevisionHistory() { +function openRevisionHistory() { mobileHelper.openHamburgerMenu(); cy.contains('.menu-entry-with-icon', 'File') @@ -14,12 +14,18 @@ function checkAndCloseRevisionHistory() { cy.wrap(item) .click(); }); + cy.get('#app-sidebar') .should('be.visible'); cy.get('section#tab-versionsTabView') .should('be.visible'); +} + +function checkAndCloseRevisionHistory() { + openRevisionHistory(); + cy.get('.app-sidebar__close.icon-close') .then(function(item) { Cypress.env('IFRAME_LEVEL', '1'); @@ -35,6 +41,22 @@ function checkAndCloseRevisionHistory() { }); } +function restorePreviousVersion() { + openRevisionHistory(); + + cy.get('#versionsTabView .versions li:nth-of-type(1) .revertVersion') + .click(); + + cy.get('.app-sidebar__close.icon-close') + .then(function(item) { + Cypress.env('IFRAME_LEVEL', '2'); + cy.wrap(item) + .click(); + }); + + cy.wait(10000); +} + function checkAndCloseSharing() { mobileHelper.openHamburgerMenu(); @@ -121,3 +143,4 @@ module.exports.checkAndCloseRevisionHistory = checkAndCloseRevisionHistory; module.exports.checkAndCloseSharing = checkAndCloseSharing; module.exports.insertImageFromStorage = insertImageFromStorage; module.exports.saveFileAs = saveFileAs; +module.exports.restorePreviousVersion = restorePreviousVersion; diff --git a/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js b/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js index a384e2c291..b6913cc831 100644 --- a/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js @@ -2,7 +2,9 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); +var calcHelper = require('../../common/calc_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); +var calcMobileHelper = require('./calc_mobile_helper'); describe('Nextcloud specific tests.', function() { var testFileName = 'nextcloud.ods'; @@ -66,5 +68,46 @@ describe('Nextcloud specific tests.', function() { nextcloudHelper.checkAndCloseRevisionHistory(); }); + + it('Restore previous revision.', function() { + helper.beforeAll(testFileName, 'calc'); + + mobileHelper.enableEditingMobile(); + + // Initially we have "text" text in the document + calcMobileHelper.selectAllMobile(); + + cy.get('#copy-paste-container table td') + .should('have.text', 'Text'); + + // Change the document content and save it + calcHelper.clickOnFirstCell(false, true); + + helper.selectAllText(); + + helper.typeIntoDocument('new'); + + calcMobileHelper.selectAllMobile(); + + cy.get('#copy-paste-container table td') + .should('have.text', 'new'); + + mobileHelper.openHamburgerMenu(); + + cy.contains('.menu-entry-with-icon', 'File') + .click(); + + cy.contains('.menu-entry-with-icon', 'Save') + .click(); + + nextcloudHelper.restorePreviousVersion(); + + mobileHelper.enableEditingMobile(); + + calcMobileHelper.selectAllMobile(); + + cy.get('#copy-paste-container table td') + .should('have.text', 'Text'); + }); }); diff --git a/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js b/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js index b163982989..3628a5e6bf 100644 --- a/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js @@ -3,6 +3,7 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); +var impressMobileHelper = require('./impress_mobile_helper'); describe('Nextcloud specific tests.', function() { var testFileName = 'nextcloud.odp'; @@ -65,5 +66,42 @@ describe('Nextcloud specific tests.', function() { nextcloudHelper.checkAndCloseRevisionHistory(); }); + + it('Restore previous revision.', function() { + helper.beforeAll(testFileName, 'impress'); + + mobileHelper.enableEditingMobile(); + + // Initially we have "text" text in the document + impressMobileHelper.selectTextShapeInTheCenter(); + + impressMobileHelper.selectTextOfShape(); + + helper.expectTextForClipboard('text'); + + helper.typeIntoDocument('new'); + + helper.selectAllText(); + + helper.expectTextForClipboard('new'); + + mobileHelper.openHamburgerMenu(); + + cy.contains('.menu-entry-with-icon', 'File') + .click(); + + cy.contains('.menu-entry-with-icon', 'Save') + .click(); + + nextcloudHelper.restorePreviousVersion(); + + mobileHelper.enableEditingMobile(); + + impressMobileHelper.selectTextShapeInTheCenter(); + + impressMobileHelper.selectTextOfShape(); + + helper.expectTextForClipboard('text'); + }); }); diff --git a/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js b/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js index 5224cb0909..9a66b4e63e 100644 --- a/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js @@ -3,6 +3,7 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); +var writerMobileHelper = require('./writer_mobile_helper'); describe('Nextcloud specific tests.', function() { var testFileName = 'nextcloud.odt'; @@ -64,5 +65,39 @@ describe('Nextcloud specific tests.', function() { nextcloudHelper.checkAndCloseRevisionHistory(); }); + + it('Restore previous revision.', function() { + helper.beforeAll(testFileName, 'writer'); + + mobileHelper.enableEditingMobile(); + + // Initially we have "text" text in the document + writerMobileHelper.selectAllMobile(); + + helper.expectTextForClipboard('text'); + + // Change the document content and save it + helper.typeIntoDocument('new'); + + writerMobileHelper.selectAllMobile(); + + helper.expectTextForClipboard('new'); + + mobileHelper.openHamburgerMenu(); + + cy.contains('.menu-entry-with-icon', 'File') + .click(); + + cy.contains('.menu-entry-with-icon', 'Save') + .click(); + + nextcloudHelper.restorePreviousVersion(); + + mobileHelper.enableEditingMobile(); + + writerMobileHelper.selectAllMobile(); + + helper.expectTextForClipboard('text'); + }); });