From de74eae245fc49f6e9d84c772422efcc78dae5d3 Mon Sep 17 00:00:00 2001 From: Ashod Nakashian Date: Fri, 17 Dec 2021 01:44:05 -0500 Subject: cypress: give each test a unique test document We copy each test document into the work-dir and now we also give them a random prefix. This is critical to ensure that parallel runs do not re-use the same document. Also, when closing a document, we wait for the document-name to disappear from the admin console. Sharing the same document, or even the name, means we are likely to see random results. Signed-off-by: Ashod Nakashian (cherry picked from commit d998f2c1c8a163c3ef870bbe8581a364df3905bb) Change-Id: I2f41566952c49c9c63ee206bcba6a4dd49cdd6d0 --- cypress_test/integration_tests/common/helper.js | 44 +++++++++++++++++----- .../desktop/calc/annotation_spec.js | 5 ++- .../desktop/calc/apply_font_spec.js | 5 ++- .../desktop/calc/bottom_bar_spec.js | 5 ++- .../desktop/calc/cell_appearance_spec.js | 5 ++- .../desktop/calc/delete_objects_spec.js | 5 ++- .../integration_tests/desktop/calc/focus_spec.js | 5 ++- .../desktop/calc/image_operation_spec.js | 5 ++- .../desktop/calc/searchbar_spec.js | 5 ++- .../desktop/calc/sheet_operation_spec.js | 5 ++- .../calc/sidebar_dialog_image_caching_spec.js | 5 ++- .../desktop/calc/statusbar_spec.js | 5 ++- .../desktop/calc/top_toolbar_spec.js | 5 ++- .../desktop/calc/tunneled_dialog_spec.js | 5 ++- .../desktop/draw/pdf_page_up_down_spec.js | 5 ++- .../desktop/impress/annotation_spec.js | 10 +++-- .../desktop/impress/apply_font_spec.js | 5 ++- .../impress/apply_paragraph_props_text_spec.js | 5 ++- .../desktop/impress/delete_objects_spec.js | 5 ++- .../desktop/impress/image_operation_spec.js | 5 ++- .../desktop/impress/searchbar_spec.js | 5 ++- .../desktop/impress/slide_operations_spec.js | 5 ++- .../desktop/impress/statusbar_spec.js | 5 ++- .../desktop/impress/table_operation_spec.js | 5 ++- .../desktop/impress/top_toolbar_spec.js | 5 ++- .../desktop/writer/annotation_spec.js | 5 ++- .../desktop/writer/apply_font_spec.js | 5 ++- .../writer/apply_paragraph_properties_spec.js | 5 ++- .../desktop/writer/complex_image_operation_spec.js | 5 ++- .../desktop/writer/copy_paste_spec.js | 5 ++- .../desktop/writer/delete_objects_spec.js | 5 ++- .../integration_tests/desktop/writer/focus_spec.js | 5 ++- .../desktop/writer/form_field_spec.js | 3 +- .../desktop/writer/image_operation_spec.js | 5 ++- .../desktop/writer/searchbar_spec.js | 5 ++- .../desktop/writer/statusbar_spec.js | 5 ++- .../desktop/writer/table_operation_spec.js | 5 ++- .../desktop/writer/top_toolbar_spec.js | 5 ++- .../desktop/writer/track_changes_spec.js | 5 ++- .../mobile/calc/alignment_options_spec.js | 5 ++- .../mobile/calc/annotation_spec.js | 6 ++- .../mobile/calc/apply_font_spec.js | 5 ++- .../mobile/calc/bottom_toolbar_spec.js | 3 +- .../mobile/calc/cell_appearance_spec.js | 5 ++- .../integration_tests/mobile/calc/chart_spec.js | 5 ++- .../mobile/calc/delete_objects_spec.js | 5 ++- .../integration_tests/mobile/calc/focus_spec.js | 5 ++- .../mobile/calc/formulabar_spec.js | 5 ++- .../mobile/calc/hamburger_menu_spec.js | 5 +-- .../mobile/calc/image_operation_spec.js | 5 ++- .../mobile/calc/insertion_wizard_spec.js | 5 ++- .../mobile/calc/nextcloud_spec.js | 9 +++-- .../mobile/calc/number_format_spec.js | 5 ++- .../integration_tests/mobile/calc/overlays_spec.js | 5 ++- .../mobile/calc/searchbar_spec.js | 5 ++- .../mobile/calc/sheet_operation_spec.js | 5 ++- .../mobile/calc/spellchecking_spec.js | 5 ++- .../mobile/impress/annotation_spec.js | 5 ++- .../mobile/impress/apply_font_shape_spec.js | 5 ++- .../mobile/impress/apply_font_text_spec.js | 5 ++- .../impress/apply_paragraph_props_shape_spec.js | 5 ++- .../impress/apply_paragraph_props_text_spec.js | 5 ++- .../mobile/impress/delete_objects_spec.js | 5 ++- .../mobile/impress/hamburger_menu_spec.js | 3 +- .../mobile/impress/image_operation_spec.js | 5 ++- .../mobile/impress/impress_focus_spec.js | 5 ++- .../mobile/impress/insertion_wizard_spec.js | 5 ++- .../mobile/impress/nextcloud_spec.js | 9 +++-- .../mobile/impress/searchbar_spec.js | 5 ++- .../mobile/impress/slide_operation_spec.js | 5 ++- .../mobile/impress/slide_properties_spec.js | 5 ++- .../mobile/impress/spellchecking_spec.js | 5 ++- .../mobile/impress/table_operation_spec.js | 5 ++- .../mobile/writer/annotation_spec.js | 5 ++- .../mobile/writer/apply_font_spec.js | 5 ++- .../writer/apply_paragraph_properties_spec.js | 5 ++- .../mobile/writer/bottom_toolbar_spec.js | 5 ++- .../integration_tests/mobile/writer/cursor_spec.js | 3 +- .../mobile/writer/delete_objects_spec.js | 5 ++- .../integration_tests/mobile/writer/focus_spec.js | 5 ++- .../mobile/writer/hamburger_menu_spec.js | 5 ++- .../mobile/writer/image_operation_spec.js | 5 ++- .../mobile/writer/insert_field_spec.js | 5 ++- .../mobile/writer/insert_formatting_mark_spec.js | 5 ++- .../mobile/writer/insert_object_spec.js | 5 ++- .../mobile/writer/mobile_wizard_state_spec.js | 5 ++- .../mobile/writer/nextcloud_spec.js | 9 +++-- .../mobile/writer/searchbar_spec.js | 5 ++- .../mobile/writer/shape_properties_spec.js | 5 ++- .../mobile/writer/spellchecking_spec.js | 5 ++- .../mobile/writer/table_properties_spec.js | 3 +- .../mobile/writer/toolbar_spec.js | 5 ++- .../mobile/writer/track_changes_spec.js | 5 ++- cypress_test/plugins/tasks.js | 9 ++++- 94 files changed, 317 insertions(+), 204 deletions(-) (limited to 'cypress_test') diff --git a/cypress_test/integration_tests/common/helper.js b/cypress_test/integration_tests/common/helper.js index bbd40a1243..8bc25cfa1b 100644 --- a/cypress_test/integration_tests/common/helper.js +++ b/cypress_test/integration_tests/common/helper.js @@ -9,9 +9,17 @@ var mobileWizardIdleTime = 1250; // By default, we create a copy to have a clear test document but // but when we test saving functionality we need to open same docuement // isMultiUser - whether the test is for multiuser -function loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser) { +// noRename - whether or not to give the file a unique name, if noFileCopy is false. +function loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser, noRename) { cy.log('Loading test document with a local build - start.'); - cy.log('Param - fileName: ' + fileName); + + var newFileName = fileName; + if (noRename !== true && noFileCopy !== true) { + var randomName = (Math.random() + 1).toString(36).substring(7); + newFileName = randomName + '_' + fileName; + } + + cy.log('Param - fileName: ' + fileName + ' -> ' + newFileName); cy.log('Param - subFolder: ' + subFolder); cy.log('Param - noFileCopy: ' + noFileCopy); cy.log('Param - isMultiUser: ' + isMultiUser); @@ -24,12 +32,14 @@ function loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser) sourceDir: Cypress.env('DATA_FOLDER'), destDir: Cypress.env('DATA_WORKDIR'), fileName: fileName, + destFileName: newFileName, }); } else { cy.task('copyFile', { sourceDir: Cypress.env('DATA_FOLDER') + subFolder + '/', destDir: Cypress.env('DATA_WORKDIR') + subFolder + '/', fileName: fileName, + destFileName: newFileName, }); } } @@ -46,12 +56,12 @@ function loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser) URI += '/browser/' + Cypress.env('WSD_VERSION_HASH') + '/debug.html?lang=en-US&file_path=' + - Cypress.env('DATA_WORKDIR') + fileName; + Cypress.env('DATA_WORKDIR') + newFileName; } else { URI += '/browser/' + Cypress.env('WSD_VERSION_HASH') + '/debug.html?lang=en-US&file_path=' + - Cypress.env('DATA_WORKDIR') + subFolder + '/' + fileName; + Cypress.env('DATA_WORKDIR') + subFolder + '/' + newFileName; } if (isMultiUser) { @@ -86,6 +96,7 @@ function loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser) }); } cy.log('Loading test document with a local build - end.'); + return newFileName; } // Loading the test document inside a Nextcloud integration. @@ -304,7 +315,8 @@ function waitForInterferingUser() { // subsequentLoad - whether we load a test document for the first time in the // test case or not. It's important for nextcloud because we need to sign in // with the username + password only for the first time. -function loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoad, hasInteractionBeforeLoad) { +// noRename - whether or not to give the file a unique name, if noFileCopy is false. +function loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoad, hasInteractionBeforeLoad, noRename) { cy.log('Loading test document - start.'); cy.log('Param - fileName: ' + fileName); cy.log('Param - subFolder: ' + subFolder); @@ -318,10 +330,11 @@ function loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoa cy.viewport('iphone-6'); }); + var destFileName = fileName; if (Cypress.env('INTEGRATION') === 'nextcloud') { loadTestDocNextcloud(fileName, subFolder, subsequentLoad); } else { - loadTestDocNoIntegration(fileName, subFolder, noFileCopy, isMultiUser); + destFileName = loadTestDocNoIntegration(fileName, subFolder, noFileCopy, noRename); } // When dialog appears before document load (eg. macro warning, csv import options) @@ -333,6 +346,8 @@ function loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoa } else { checkIfBothDocIsLoaded(); } + + return destFileName; } function checkIfBothDocIsLoaded() { @@ -501,12 +516,17 @@ function matchClipboardText(regexp) { // some modification. The purpose is typically to verify that // said changes were preserved in the document upon closing. function reload(fileName, subFolder, noFileCopy, subsequentLoad) { + cy.log('Reloading document: ' + subFolder + '/' + fileName); + cy.log('Reloading document - noFileCopy: ' + noFileCopy); + cy.log('Reloading document - subsequentLoad: ' + subsequentLoad); closeDocument(fileName, ''); - loadTestDoc(fileName, subFolder, noFileCopy, subsequentLoad); + var noRename = true; + return loadTestDoc(fileName, subFolder, noFileCopy, subsequentLoad, noRename); } -function beforeAll(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoad, hasInteractionBeforeLoad) { - loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoad, hasInteractionBeforeLoad); +// noRename - whether or not to give the file a unique name, if noFileCopy is false. +function beforeAll(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoad, hasInteractionBeforeLoad, noRename) { + return loadTestDoc(fileName, subFolder, noFileCopy, isMultiUser, subsequentLoad, hasInteractionBeforeLoad, noRename); } function afterAll(fileName, testState) { @@ -606,7 +626,11 @@ function closeDocument(fileName, testState) { // We have PID number before the file names, with matching // also on the PID number we can make sure to match on the // whole file name, not on a suffix of a file name. - var regex = new RegExp('[0-9]' + fileName); + var rexname = '[0-9]' + fileName; + var regex = new RegExp(rexname); + cy.log('closeDocument - waiting not.match: ' + rexname); + // Saving may take much longer now to ensure no unsaved data exists. + // This is not an issue on a fast machine, but on the CI we do timeout often. cy.get('#docview', { timeout: Cypress.config('defaultCommandTimeout') * 2.0 }) .invoke('text') .should('not.match', regex); diff --git a/cypress_test/integration_tests/desktop/calc/annotation_spec.js b/cypress_test/integration_tests/desktop/calc/annotation_spec.js index cef76d4250..2cc1f9a2ac 100644 --- a/cypress_test/integration_tests/desktop/calc/annotation_spec.js +++ b/cypress_test/integration_tests/desktop/calc/annotation_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); var { insertMultipleComment } = require('../../common/desktop_helper'); describe('Annotation Tests', function() { - var testFileName = 'annotation.ods'; + var origTestFileName = 'annotation.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/apply_font_spec.js b/cypress_test/integration_tests/desktop/calc/apply_font_spec.js index 86f5aa1388..012c0c3cd7 100644 --- a/cypress_test/integration_tests/desktop/calc/apply_font_spec.js +++ b/cypress_test/integration_tests/desktop/calc/apply_font_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); describe('Apply font changes.', function() { - var testFileName = 'apply_font.ods'; + var origTestFileName = 'apply_font.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); calcHelper.clickOnFirstCell(); }); diff --git a/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js b/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js index bdd9d24d7e..3a160049ad 100644 --- a/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js +++ b/cypress_test/integration_tests/desktop/calc/bottom_bar_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); describe('Calc bottom bar tests.', function() { - var testFileName = 'BottomBar.ods'; + var origTestFileName = 'BottomBar.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/cell_appearance_spec.js b/cypress_test/integration_tests/desktop/calc/cell_appearance_spec.js index 7991113d4b..39b515c060 100644 --- a/cypress_test/integration_tests/desktop/calc/cell_appearance_spec.js +++ b/cypress_test/integration_tests/desktop/calc/cell_appearance_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var desktopHelper = require('../../common/desktop_helper'); describe('Change cell appearance.', function() { - var testFileName = 'cell_appearance.ods'; + var origTestFileName = 'cell_appearance.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/delete_objects_spec.js b/cypress_test/integration_tests/desktop/calc/delete_objects_spec.js index 4d1d7fe096..c275ac4c9e 100644 --- a/cypress_test/integration_tests/desktop/calc/delete_objects_spec.js +++ b/cypress_test/integration_tests/desktop/calc/delete_objects_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('Delete Objects', function() { - var testFileName = 'delete_objects.ods'; + var origTestFileName = 'delete_objects.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/focus_spec.js b/cypress_test/integration_tests/desktop/calc/focus_spec.js index e1736a10ee..6d402714c7 100644 --- a/cypress_test/integration_tests/desktop/calc/focus_spec.js +++ b/cypress_test/integration_tests/desktop/calc/focus_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); describe('Calc focus tests', function() { - var testFileName = 'focus.ods'; + var origTestFileName = 'focus.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/image_operation_spec.js b/cypress_test/integration_tests/desktop/calc/image_operation_spec.js index fbe3c2aa03..b9bb21c788 100644 --- a/cypress_test/integration_tests/desktop/calc/image_operation_spec.js +++ b/cypress_test/integration_tests/desktop/calc/image_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var { insertImage } = require('../../common/desktop_helper'); describe('Image Operation Tests', function() { - var testFileName = 'image_operation.ods'; + var origTestFileName = 'image_operation.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/searchbar_spec.js b/cypress_test/integration_tests/desktop/calc/searchbar_spec.js index 56c9134825..d2bb6cdbc8 100644 --- a/cypress_test/integration_tests/desktop/calc/searchbar_spec.js +++ b/cypress_test/integration_tests/desktop/calc/searchbar_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var searchHelper = require('../../common/search_helper'); describe('Searching via search bar.', function() { - var testFileName = 'search_bar.ods'; + var origTestFileName = 'search_bar.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js b/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js index c180d86dda..67028e266a 100644 --- a/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js +++ b/cypress_test/integration_tests/desktop/calc/sheet_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); describe('Sheet Operations.', function () { - var testFileName = 'sheet_operation.ods'; + var origTestFileName = 'sheet_operation.ods'; + var testFileName; beforeEach(function () { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function () { diff --git a/cypress_test/integration_tests/desktop/calc/sidebar_dialog_image_caching_spec.js b/cypress_test/integration_tests/desktop/calc/sidebar_dialog_image_caching_spec.js index 30fbb49142..301e141f9d 100644 --- a/cypress_test/integration_tests/desktop/calc/sidebar_dialog_image_caching_spec.js +++ b/cypress_test/integration_tests/desktop/calc/sidebar_dialog_image_caching_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('Calc sidebar dialog image caching', function() { - var testFileName = 'many-sizes.ods'; + var origTestFileName = 'many-sizes.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/statusbar_spec.js b/cypress_test/integration_tests/desktop/calc/statusbar_spec.js index ba91b6feb4..8b86e85d6f 100644 --- a/cypress_test/integration_tests/desktop/calc/statusbar_spec.js +++ b/cypress_test/integration_tests/desktop/calc/statusbar_spec.js @@ -5,10 +5,11 @@ var desktopHelper = require('../../common/desktop_helper'); var calcHelper = require('../../common/calc_helper'); describe('Statubar tests.', function() { - var testFileName = 'statusbar.ods'; + var origTestFileName = 'statusbar.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.showStatusBarIfHidden (); diff --git a/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js index 3c1d4c26c9..aacc586c6b 100644 --- a/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js @@ -5,10 +5,11 @@ var desktopHelper = require('../../common/desktop_helper'); var calcHelper = require('../../common/calc_helper'); describe('Top toolbar tests.', function() { - var testFileName = 'top_toolbar.ods'; + var origTestFileName = 'top_toolbar.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); calcHelper.clickOnFirstCell(); }); diff --git a/cypress_test/integration_tests/desktop/calc/tunneled_dialog_spec.js b/cypress_test/integration_tests/desktop/calc/tunneled_dialog_spec.js index 28ded0e1cf..dd5766d36e 100644 --- a/cypress_test/integration_tests/desktop/calc/tunneled_dialog_spec.js +++ b/cypress_test/integration_tests/desktop/calc/tunneled_dialog_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('LOK tunnelled dialog tests', function() { - var testFileName = 'tunneled_dialog.ods'; + var origTestFileName = 'tunneled_dialog.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/draw/pdf_page_up_down_spec.js b/cypress_test/integration_tests/desktop/draw/pdf_page_up_down_spec.js index 00054b1d8d..0d6af1675b 100644 --- a/cypress_test/integration_tests/desktop/draw/pdf_page_up_down_spec.js +++ b/cypress_test/integration_tests/desktop/draw/pdf_page_up_down_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('PDF View Tests', function() { - var testFileName = 'pdf_page_up_down.pdf'; + var origTestFileName = 'pdf_page_up_down.pdf'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'draw'); + testFileName = helper.beforeAll(origTestFileName, 'draw'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/impress/annotation_spec.js b/cypress_test/integration_tests/desktop/impress/annotation_spec.js index 1d7fd6f874..2bedaa5226 100644 --- a/cypress_test/integration_tests/desktop/impress/annotation_spec.js +++ b/cypress_test/integration_tests/desktop/impress/annotation_spec.js @@ -6,11 +6,12 @@ var { addSlide, changeSlide } = require('../../common/impress_helper'); var { insertMultipleComment } = require('../../common/desktop_helper'); describe('Annotation Tests', function() { - var testFileName = 'comment_switching.odp'; + var origTestFileName = 'comment_switching.odp'; + var testFileName; beforeEach(function() { cy.viewport(1500, 600); - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.hideSidebarIfVisible(); @@ -173,10 +174,11 @@ describe('Collapsed Annotation Tests', function() { }); describe('Comment Scrolling',function() { - var testFileName = 'comment_switching.odp'; + var origTestFileName = 'comment_switching.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); if (Cypress.env('USER_INTERFACE') === 'notebookbar') { cy.get('.unospan-optionstoolboxdown.unoModifyPage').click(); diff --git a/cypress_test/integration_tests/desktop/impress/apply_font_spec.js b/cypress_test/integration_tests/desktop/impress/apply_font_spec.js index 9107dfda3d..8bd1212650 100644 --- a/cypress_test/integration_tests/desktop/impress/apply_font_spec.js +++ b/cypress_test/integration_tests/desktop/impress/apply_font_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var impressHelper = require('../../common/impress_helper'); describe('Apply font on selected text.', function() { - var testFileName = 'apply_font_text.odp'; + var origTestFileName = 'apply_font_text.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); cy.get('#toolbar-up > .w2ui-scroll-right') .click(); diff --git a/cypress_test/integration_tests/desktop/impress/apply_paragraph_props_text_spec.js b/cypress_test/integration_tests/desktop/impress/apply_paragraph_props_text_spec.js index f1f9fcb609..29d69bf177 100644 --- a/cypress_test/integration_tests/desktop/impress/apply_paragraph_props_text_spec.js +++ b/cypress_test/integration_tests/desktop/impress/apply_paragraph_props_text_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var impressHelper = require('../../common/impress_helper'); describe('Apply paragraph properties on selected shape.', function() { - var testFileName = 'apply_paragraph_props_text.odp'; + var origTestFileName = 'apply_paragraph_props_text.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); helper.clickOnIdle('#toolbar-up > .w2ui-scroll-right'); diff --git a/cypress_test/integration_tests/desktop/impress/delete_objects_spec.js b/cypress_test/integration_tests/desktop/impress/delete_objects_spec.js index a7cc2a8fbb..56681f8f87 100644 --- a/cypress_test/integration_tests/desktop/impress/delete_objects_spec.js +++ b/cypress_test/integration_tests/desktop/impress/delete_objects_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var desktopHelper = require('../../common/desktop_helper'); describe('Delete Objects', function() { - var testFileName = 'delete_objects.odp'; + var origTestFileName = 'delete_objects.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/impress/image_operation_spec.js b/cypress_test/integration_tests/desktop/impress/image_operation_spec.js index 7f2a7d1701..e034b6336c 100644 --- a/cypress_test/integration_tests/desktop/impress/image_operation_spec.js +++ b/cypress_test/integration_tests/desktop/impress/image_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var { insertImage, deleteImage } = require('../../common/desktop_helper'); describe('Image Operation Tests', function() { - var testFileName = 'image_operation.odp'; + var origTestFileName = 'image_operation.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/impress/searchbar_spec.js b/cypress_test/integration_tests/desktop/impress/searchbar_spec.js index 58b967f58b..bf6b7332c2 100644 --- a/cypress_test/integration_tests/desktop/impress/searchbar_spec.js +++ b/cypress_test/integration_tests/desktop/impress/searchbar_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var searchHelper = require('../../common/search_helper'); describe('Searching via search bar' ,function() { - var testFileName = 'search_bar.odp'; + var origTestFileName = 'search_bar.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js b/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js index 580a7e1163..17bbae454c 100644 --- a/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js +++ b/cypress_test/integration_tests/desktop/impress/slide_operations_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var impressHelper = require('../../common/impress_helper'); describe('Slide operations', function() { - var testFileName = 'slide_operations.odp'; + var origTestFileName = 'slide_operations.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/impress/statusbar_spec.js b/cypress_test/integration_tests/desktop/impress/statusbar_spec.js index b6346ea9ad..b4fadf5f8a 100644 --- a/cypress_test/integration_tests/desktop/impress/statusbar_spec.js +++ b/cypress_test/integration_tests/desktop/impress/statusbar_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var desktopHelper = require('../../common/desktop_helper'); describe('Statubar tests.', function() { - var testFileName = 'statusbar.odp'; + var origTestFileName = 'statusbar.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.showStatusBarIfHidden (); diff --git a/cypress_test/integration_tests/desktop/impress/table_operation_spec.js b/cypress_test/integration_tests/desktop/impress/table_operation_spec.js index dfce36e23c..6c2e7403be 100644 --- a/cypress_test/integration_tests/desktop/impress/table_operation_spec.js +++ b/cypress_test/integration_tests/desktop/impress/table_operation_spec.js @@ -6,10 +6,11 @@ var impressHelper = require('../../common/impress_helper'); var mode = Cypress.env('USER_INTERFACE'); describe.skip('Table operations', function() { - var testFileName = 'table_operation.odp'; + var origTestFileName = 'table_operation.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); desktopHelper.selectZoomLevel('50'); }); diff --git a/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js index ca0fd084f3..692ec11b0f 100644 --- a/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js @@ -5,10 +5,11 @@ var impressHelper = require('../../common/impress_helper'); var desktopHelper = require('../../common/desktop_helper'); describe('Top toolbar tests.', function() { - var testFileName = 'top_toolbar.odp'; + var origTestFileName = 'top_toolbar.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.hideSidebarIfVisible(); diff --git a/cypress_test/integration_tests/desktop/writer/annotation_spec.js b/cypress_test/integration_tests/desktop/writer/annotation_spec.js index c8791b84bd..bfa749a18d 100644 --- a/cypress_test/integration_tests/desktop/writer/annotation_spec.js +++ b/cypress_test/integration_tests/desktop/writer/annotation_spec.js @@ -4,11 +4,12 @@ var helper = require('../../common/helper'); var { insertMultipleComment, hideSidebar, selectZoomLevel } = require('../../common/desktop_helper'); describe('Annotation Tests', function() { - var testFileName = 'annotation.odt'; + var origTestFileName = 'annotation.odt'; + var testFileName; beforeEach(function() { cy.viewport(1400, 600); - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); var mode = Cypress.env('USER_INTERFACE'); if (mode === 'notebookbar') { cy.get('.unospan-optionstoolboxdown.unoSidebar') diff --git a/cypress_test/integration_tests/desktop/writer/apply_font_spec.js b/cypress_test/integration_tests/desktop/writer/apply_font_spec.js index 4d48c80769..d092c5126a 100644 --- a/cypress_test/integration_tests/desktop/writer/apply_font_spec.js +++ b/cypress_test/integration_tests/desktop/writer/apply_font_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var writerHelper = require('../../common/writer_helper'); describe.skip('Apply font changes.', function() { - var testFileName = 'apply_font.odt'; + var origTestFileName = 'apply_font.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/apply_paragraph_properties_spec.js b/cypress_test/integration_tests/desktop/writer/apply_paragraph_properties_spec.js index b4a2cec48b..4d264fe7e4 100644 --- a/cypress_test/integration_tests/desktop/writer/apply_paragraph_properties_spec.js +++ b/cypress_test/integration_tests/desktop/writer/apply_paragraph_properties_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var writerHelper = require('../../common/writer_helper'); describe('Apply paragraph properties.', function() { - var testFileName = 'apply_paragraph_properties.odt'; + var origTestFileName = 'apply_paragraph_properties.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); writerHelper.selectAllTextOfDoc(); }); diff --git a/cypress_test/integration_tests/desktop/writer/complex_image_operation_spec.js b/cypress_test/integration_tests/desktop/writer/complex_image_operation_spec.js index 1cf7125cf2..ca53fc93b8 100644 --- a/cypress_test/integration_tests/desktop/writer/complex_image_operation_spec.js +++ b/cypress_test/integration_tests/desktop/writer/complex_image_operation_spec.js @@ -3,11 +3,12 @@ var helper = require('../../common/helper'); describe('Complex image operation test', function() { - var testFileName = 'complex_image_operation.odt'; + var origTestFileName = 'complex_image_operation.odt'; + var testFileName; beforeEach(function() { localStorage.setItem('image_validation_test', true); - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js b/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js index 2788604c68..32d1d9b180 100644 --- a/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js +++ b/cypress_test/integration_tests/desktop/writer/copy_paste_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('Clipboard operations.', function() { - var testFileName = 'copy_paste.odt'; + var origTestFileName = 'copy_paste.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/delete_objects_spec.js b/cypress_test/integration_tests/desktop/writer/delete_objects_spec.js index d5b1322873..d28fedf474 100644 --- a/cypress_test/integration_tests/desktop/writer/delete_objects_spec.js +++ b/cypress_test/integration_tests/desktop/writer/delete_objects_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('Delete Objects', {retries: 2}, function() { - var testFileName = 'delete_objects.odt'; + var origTestFileName = 'delete_objects.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/focus_spec.js b/cypress_test/integration_tests/desktop/writer/focus_spec.js index 707f5ecafb..72b2804b4c 100644 --- a/cypress_test/integration_tests/desktop/writer/focus_spec.js +++ b/cypress_test/integration_tests/desktop/writer/focus_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('Focus tests', function() { - var testFileName = 'focus.odt'; + var origTestFileName = 'focus.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/form_field_spec.js b/cypress_test/integration_tests/desktop/writer/form_field_spec.js index 7c6f9a3acb..805e07d23a 100644 --- a/cypress_test/integration_tests/desktop/writer/form_field_spec.js +++ b/cypress_test/integration_tests/desktop/writer/form_field_spec.js @@ -7,8 +7,7 @@ describe('Form field button tests.', function() { var testFileName = 'shape_operations.odt'; function before(fileName) { - testFileName = fileName; - helper.beforeAll(fileName, 'writer'); + testFileName = helper.beforeAll(fileName, 'writer'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.showStatusBarIfHidden(); diff --git a/cypress_test/integration_tests/desktop/writer/image_operation_spec.js b/cypress_test/integration_tests/desktop/writer/image_operation_spec.js index b9bc91ce0f..443c2a29de 100644 --- a/cypress_test/integration_tests/desktop/writer/image_operation_spec.js +++ b/cypress_test/integration_tests/desktop/writer/image_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var { insertImage, deleteImage } = require('../../common/desktop_helper'); describe('Image Operation Tests', function() { - var testFileName = 'image_operation.odt'; + var origTestFileName = 'image_operation.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/searchbar_spec.js b/cypress_test/integration_tests/desktop/writer/searchbar_spec.js index ac56bcddc5..19a7e5bd7b 100644 --- a/cypress_test/integration_tests/desktop/writer/searchbar_spec.js +++ b/cypress_test/integration_tests/desktop/writer/searchbar_spec.js @@ -5,10 +5,11 @@ var searchHelper = require('../../common/search_helper'); var writerHelper = require('../../common/writer_helper'); describe('Searching via search bar' ,function() { - var testFileName = 'search_bar.odt'; + var origTestFileName = 'search_bar.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/writer/statusbar_spec.js b/cypress_test/integration_tests/desktop/writer/statusbar_spec.js index 94bc224507..843519f0a0 100644 --- a/cypress_test/integration_tests/desktop/writer/statusbar_spec.js +++ b/cypress_test/integration_tests/desktop/writer/statusbar_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var desktopHelper = require('../../common/desktop_helper'); describe('Statubar tests.', function() { - var testFileName = 'statusbar.odt'; + var origTestFileName = 'statusbar.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.showStatusBarIfHidden (); diff --git a/cypress_test/integration_tests/desktop/writer/table_operation_spec.js b/cypress_test/integration_tests/desktop/writer/table_operation_spec.js index e35a9ac4a1..fde847c27f 100644 --- a/cypress_test/integration_tests/desktop/writer/table_operation_spec.js +++ b/cypress_test/integration_tests/desktop/writer/table_operation_spec.js @@ -5,10 +5,11 @@ var desktopHelper = require('../../common/desktop_helper'); var mode = Cypress.env('USER_INTERFACE'); describe('Table operations', function() { - var testFileName = 'table_operation.odt'; + var origTestFileName = 'table_operation.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); desktopHelper.selectZoomLevel('70'); }); diff --git a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js index 6a2ff53028..2b86a486ab 100644 --- a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js @@ -6,10 +6,11 @@ var writerHelper = require('../../common/writer_helper'); var mode = Cypress.env('USER_INTERFACE'); describe('Top toolbar tests.', function() { - var testFileName = 'top_toolbar.odt'; + var origTestFileName = 'top_toolbar.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); if (Cypress.env('INTEGRATION') === 'nextcloud') { desktopHelper.showSidebarIfHidden(); diff --git a/cypress_test/integration_tests/desktop/writer/track_changes_spec.js b/cypress_test/integration_tests/desktop/writer/track_changes_spec.js index 8f3ff4f899..295f7fb89c 100644 --- a/cypress_test/integration_tests/desktop/writer/track_changes_spec.js +++ b/cypress_test/integration_tests/desktop/writer/track_changes_spec.js @@ -3,10 +3,11 @@ var helper = require('../../common/helper'); describe('Track Changes', function () { - var testFileName = 'track_changes.odt'; + var origTestFileName = 'track_changes.odt'; + var testFileName; beforeEach(function () { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function () { diff --git a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js index 960bb8c8e0..c68c376377 100644 --- a/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js +++ b/cypress_test/integration_tests/mobile/calc/alignment_options_spec.js @@ -6,10 +6,11 @@ var mobileHelper = require('../../common/mobile_helper'); var calcMobileHelper = require('./calc_mobile_helper'); describe('Change alignment settings.', function() { - var testFileName = 'alignment_options.ods'; + var origTestFileName = 'alignment_options.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/annotation_spec.js b/cypress_test/integration_tests/mobile/calc/annotation_spec.js index c4a171d3f2..bff16ed0ba 100644 --- a/cypress_test/integration_tests/mobile/calc/annotation_spec.js +++ b/cypress_test/integration_tests/mobile/calc/annotation_spec.js @@ -4,9 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Annotation Tests',function() { - var testFileName = 'annotation.ods'; + var origTestFileName = 'annotation.ods'; + var testFileName; + beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js index 70237904dd..c0590b1f25 100644 --- a/cypress_test/integration_tests/mobile/calc/apply_font_spec.js +++ b/cypress_test/integration_tests/mobile/calc/apply_font_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Apply font changes.', function() { - var testFileName = 'apply_font.ods'; + var origTestFileName = 'apply_font.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js index 96c6caf40b..83cc6155cf 100644 --- a/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js +++ b/cypress_test/integration_tests/mobile/calc/bottom_toolbar_spec.js @@ -9,8 +9,7 @@ describe('Interact with bottom toolbar.', function() { var testFileName; function before(fileName) { - testFileName = fileName; - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(fileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js index 60c59d77ed..0e256f4459 100644 --- a/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js +++ b/cypress_test/integration_tests/mobile/calc/cell_appearance_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Change cell appearance.', function() { - var testFileName = 'cell_appearance.ods'; + var origTestFileName = 'cell_appearance.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/chart_spec.js b/cypress_test/integration_tests/mobile/calc/chart_spec.js index 96476fa379..eb45abbbd7 100644 --- a/cypress_test/integration_tests/mobile/calc/chart_spec.js +++ b/cypress_test/integration_tests/mobile/calc/chart_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var calcHelper = require('../../common/calc_helper'); describe('Chart tests.', function() { - var testFileName = 'chart.ods'; + var origTestFileName = 'chart.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/delete_objects_spec.js b/cypress_test/integration_tests/mobile/calc/delete_objects_spec.js index 439d015380..261f9e5bb1 100644 --- a/cypress_test/integration_tests/mobile/calc/delete_objects_spec.js +++ b/cypress_test/integration_tests/mobile/calc/delete_objects_spec.js @@ -5,7 +5,8 @@ var mobileHelper = require('../../common/mobile_helper'); var calcHelper = require('../../common/calc_helper'); describe('Delete Objects',function() { - var testFileName = 'delete_objects.ods'; + var origTestFileName = 'delete_objects.ods'; + var testFileName; var eventOptions = { force: true, @@ -14,7 +15,7 @@ describe('Delete Objects',function() { }; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/focus_spec.js b/cypress_test/integration_tests/mobile/calc/focus_spec.js index 6ce64c0af1..b102f4b0bd 100644 --- a/cypress_test/integration_tests/mobile/calc/focus_spec.js +++ b/cypress_test/integration_tests/mobile/calc/focus_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var calcHelper = require('../../common/calc_helper'); describe('Calc focus tests', function() { - var testFileName = 'focus.ods'; + var origTestFileName = 'focus.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Wait until the Formula-Bar is loaded. cy.get('.inputbar_container', {timeout : 10000}); diff --git a/cypress_test/integration_tests/mobile/calc/formulabar_spec.js b/cypress_test/integration_tests/mobile/calc/formulabar_spec.js index e6ac337b66..51827e21a7 100644 --- a/cypress_test/integration_tests/mobile/calc/formulabar_spec.js +++ b/cypress_test/integration_tests/mobile/calc/formulabar_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Formula bar tests.', function() { - var testFileName = 'formulabar.ods'; + var origTestFileName = 'formulabar.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js index f77483d76b..2fd5f70307 100644 --- a/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js +++ b/cypress_test/integration_tests/mobile/calc/hamburger_menu_spec.js @@ -5,11 +5,10 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Trigger hamburger menu options.', function() { - var testFileName = ''; + var testFileName; function before(testFile) { - testFileName = testFile; - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(testFile, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/image_operation_spec.js b/cypress_test/integration_tests/mobile/calc/image_operation_spec.js index addd856cdf..09cb73a556 100644 --- a/cypress_test/integration_tests/mobile/calc/image_operation_spec.js +++ b/cypress_test/integration_tests/mobile/calc/image_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Image Operation Tests', function() { - var testFileName = 'image_operation.ods'; + var origTestFileName = 'image_operation.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js index debbcc7707..a6a9ceeca0 100644 --- a/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js +++ b/cypress_test/integration_tests/mobile/calc/insertion_wizard_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Calc insertion wizard.', function() { - var testFileName = 'insertion_wizard.ods'; + var origTestFileName = 'insertion_wizard.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js b/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js index 9c4618a71d..8b3612d77d 100644 --- a/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/calc/nextcloud_spec.js @@ -5,7 +5,8 @@ var mobileHelper = require('../../common/mobile_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); describe('Nextcloud specific tests.', function() { - var testFileName = 'nextcloud.ods'; + var origTestFileName = 'nextcloud.ods'; + var testFileName; afterEach(function() { helper.afterAll(testFileName, this.currentTest.state); @@ -14,7 +15,7 @@ describe('Nextcloud specific tests.', function() { it('Insert image from storage.', function() { helper.upLoadFileToNextCloud('image_to_insert.png', 'calc'); - helper.beforeAll(testFileName, 'calc', undefined, true); + testFileName = helper.beforeAll(origTestFileName, 'calc', undefined, true); mobileHelper.enableEditingMobile(); @@ -26,7 +27,7 @@ describe('Nextcloud specific tests.', function() { }); it('Save as.', function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); @@ -52,7 +53,7 @@ describe('Nextcloud specific tests.', function() { }); it('Share.', function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/number_format_spec.js b/cypress_test/integration_tests/mobile/calc/number_format_spec.js index 16a09f27bb..d62bf76ee0 100644 --- a/cypress_test/integration_tests/mobile/calc/number_format_spec.js +++ b/cypress_test/integration_tests/mobile/calc/number_format_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Apply number formatting.', function() { - var testFileName = 'number_format.ods'; + var origTestFileName = 'number_format.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/overlays_spec.js b/cypress_test/integration_tests/mobile/calc/overlays_spec.js index 2e19d72fea..5076c17421 100644 --- a/cypress_test/integration_tests/mobile/calc/overlays_spec.js +++ b/cypress_test/integration_tests/mobile/calc/overlays_spec.js @@ -4,12 +4,13 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); -var testFileName = 'overlays.ods'; +var origTestFileName = 'overlays.ods'; +var testFileName; describe('Overlay bounds.', function () { beforeEach(function () { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/calc/searchbar_spec.js b/cypress_test/integration_tests/mobile/calc/searchbar_spec.js index 1f4d3d5221..c8cea4d33b 100644 --- a/cypress_test/integration_tests/mobile/calc/searchbar_spec.js +++ b/cypress_test/integration_tests/mobile/calc/searchbar_spec.js @@ -5,10 +5,11 @@ var searchHelper = require('../../common/search_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Searching via search bar.', function() { - var testFileName = 'search_bar.ods'; + var origTestFileName = 'search_bar.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/calc/sheet_operation_spec.js b/cypress_test/integration_tests/mobile/calc/sheet_operation_spec.js index e09d7bb8d5..2a20d92f56 100644 --- a/cypress_test/integration_tests/mobile/calc/sheet_operation_spec.js +++ b/cypress_test/integration_tests/mobile/calc/sheet_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Sheet Operation', function () { - var testFileName = 'sheet_operation.ods'; + var origTestFileName = 'sheet_operation.ods'; + var testFileName; beforeEach(function () { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js index 6459cb80fb..23e2b31988 100644 --- a/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js +++ b/cypress_test/integration_tests/mobile/calc/spellchecking_spec.js @@ -5,10 +5,11 @@ var calcHelper = require('../../common/calc_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Calc spell checking menu.', function() { - var testFileName = 'spellchecking.ods'; + var origTestFileName = 'spellchecking.ods'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'calc'); + testFileName = helper.beforeAll(origTestFileName, 'calc'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/annotation_spec.js b/cypress_test/integration_tests/mobile/impress/annotation_spec.js index 1cf47a0e2e..75e6661509 100644 --- a/cypress_test/integration_tests/mobile/impress/annotation_spec.js +++ b/cypress_test/integration_tests/mobile/impress/annotation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Annotation tests.', function() { - var testFileName = 'annotation.odp'; + var origTestFileName = 'annotation.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js b/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js index 4ad56b2aff..dac14667c5 100644 --- a/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js +++ b/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Apply font on selected shape.', function() { - var testFileName = 'apply_font_shape.odp'; + var origTestFileName = 'apply_font_shape.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js b/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js index 8c7352589a..bb01bd1df6 100644 --- a/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js +++ b/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Apply font on selected text.', function() { - var testFileName = 'apply_font_text.odp'; + var origTestFileName = 'apply_font_text.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js index 8d6da591df..9173636f1f 100644 --- a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js +++ b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_shape_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Apply paragraph properties on selected shape.', function() { - var testFileName = 'apply_paragraph_props_shape.odp'; + var origTestFileName = 'apply_paragraph_props_shape.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js index 63f9c0eade..aa26aea543 100644 --- a/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js +++ b/cypress_test/integration_tests/mobile/impress/apply_paragraph_props_text_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Apply paragraph properties on selected text.', function() { - var testFileName = 'apply_paragraph_props_text.odp'; + var origTestFileName = 'apply_paragraph_props_text.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/delete_objects_spec.js b/cypress_test/integration_tests/mobile/impress/delete_objects_spec.js index 5108f60b26..00dd172f70 100644 --- a/cypress_test/integration_tests/mobile/impress/delete_objects_spec.js +++ b/cypress_test/integration_tests/mobile/impress/delete_objects_spec.js @@ -4,7 +4,8 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Delete Objects', function() { - var testFileName = 'delete_objects.odp'; + var origTestFileName = 'delete_objects.odp'; + var testFileName; var eventOptions = { force: true, @@ -13,7 +14,7 @@ describe('Delete Objects', function() { }; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js index 588c8b65ac..7c3f9e0ea1 100644 --- a/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js +++ b/cypress_test/integration_tests/mobile/impress/hamburger_menu_spec.js @@ -8,8 +8,7 @@ describe('Trigger hamburger menu options.', function() { var testFileName = ''; function before(testFile) { - testFileName = testFile; - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(testFile, 'impress'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/image_operation_spec.js b/cypress_test/integration_tests/mobile/impress/image_operation_spec.js index 3f28685770..50d7102f67 100644 --- a/cypress_test/integration_tests/mobile/impress/image_operation_spec.js +++ b/cypress_test/integration_tests/mobile/impress/image_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Image Operation Tests', function() { - var testFileName = 'image_operation.odp'; + var origTestFileName = 'image_operation.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js index 7afcfedf91..a9bc04afcc 100644 --- a/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js +++ b/cypress_test/integration_tests/mobile/impress/impress_focus_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Impress focus tests', function() { - var testFileName = 'focus.odp'; + var origTestFileName = 'focus.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js index 0b4315e3be..dee4d55041 100644 --- a/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js +++ b/cypress_test/integration_tests/mobile/impress/insertion_wizard_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Impress insertion wizard.', function() { - var testFileName = 'insertion_wizard.odp'; + var origTestFileName = 'insertion_wizard.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js b/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js index 6f54c6e12f..11b014ee3a 100644 --- a/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/impress/nextcloud_spec.js @@ -5,7 +5,8 @@ var mobileHelper = require('../../common/mobile_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); describe('Nextcloud specific tests.', function() { - var testFileName = 'nextcloud.odp'; + var origTestFileName = 'nextcloud.odp'; + var testFileName; afterEach(function() { helper.afterAll(testFileName, this.currentTest.state); @@ -14,7 +15,7 @@ describe('Nextcloud specific tests.', function() { it('Insert image from storage.', function() { helper.upLoadFileToNextCloud('image_to_insert.png', 'impress'); - helper.beforeAll(testFileName, 'impress', undefined, true); + testFileName = helper.beforeAll(origTestFileName, 'impress', undefined, true); mobileHelper.enableEditingMobile(); @@ -25,7 +26,7 @@ describe('Nextcloud specific tests.', function() { }); it('Save as.', function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); // Click on edit button mobileHelper.enableEditingMobile(); @@ -51,7 +52,7 @@ describe('Nextcloud specific tests.', function() { }); it('Share.', function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/searchbar_spec.js b/cypress_test/integration_tests/mobile/impress/searchbar_spec.js index 90648d404c..a9064fb398 100644 --- a/cypress_test/integration_tests/mobile/impress/searchbar_spec.js +++ b/cypress_test/integration_tests/mobile/impress/searchbar_spec.js @@ -6,10 +6,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Searching via search bar.', function() { - var testFileName = 'search_bar.odp'; + var origTestFileName = 'search_bar.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/slide_operation_spec.js b/cypress_test/integration_tests/mobile/impress/slide_operation_spec.js index 3ae364e495..b405413b9c 100644 --- a/cypress_test/integration_tests/mobile/impress/slide_operation_spec.js +++ b/cypress_test/integration_tests/mobile/impress/slide_operation_spec.js @@ -5,10 +5,11 @@ var impressHelper = require('../../common/impress_helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Slide operations', function() { - var testFileName = 'slide_operations.odp'; + var origTestFileName = 'slide_operations.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js index b004211dc9..cda663f0da 100644 --- a/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js +++ b/cypress_test/integration_tests/mobile/impress/slide_properties_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Changing slide properties.', function() { - var testFileName = 'slide_properties.odp'; + var origTestFileName = 'slide_properties.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js b/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js index bc9a3dfdee..0453c7cdde 100644 --- a/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js +++ b/cypress_test/integration_tests/mobile/impress/spellchecking_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Spell checking menu.', function() { - var testFileName = 'spellchecking.odp'; + var origTestFileName = 'spellchecking.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/impress/table_operation_spec.js b/cypress_test/integration_tests/mobile/impress/table_operation_spec.js index f035607a34..9cbf5c39c8 100644 --- a/cypress_test/integration_tests/mobile/impress/table_operation_spec.js +++ b/cypress_test/integration_tests/mobile/impress/table_operation_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var impressHelper = require('../../common/impress_helper'); describe('Table Operation', function() { - var testFileName = 'table_operation.odp'; + var origTestFileName = 'table_operation.odp'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'impress'); + testFileName = helper.beforeAll(origTestFileName, 'impress'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/writer/annotation_spec.js b/cypress_test/integration_tests/mobile/writer/annotation_spec.js index 004a4335b9..0129ec5159 100644 --- a/cypress_test/integration_tests/mobile/writer/annotation_spec.js +++ b/cypress_test/integration_tests/mobile/writer/annotation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe.skip('Annotation tests.', function() { - var testFileName = 'annotation.odt'; + var origTestFileName = 'annotation.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js index 9811ea6948..5d43c3018b 100644 --- a/cypress_test/integration_tests/mobile/writer/apply_font_spec.js +++ b/cypress_test/integration_tests/mobile/writer/apply_font_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe.skip('Apply font changes.', function() { - var testFileName = 'apply_font.odt'; + var origTestFileName = 'apply_font.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js index 50dd61757f..1fef35976c 100644 --- a/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/apply_paragraph_properties_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe.skip('Apply paragraph properties.', function() { - var testFileName = 'apply_paragraph_properties.odt'; + var origTestFileName = 'apply_paragraph_properties.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js index 96fc5e0c19..1ceb6a78e2 100644 --- a/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/bottom_toolbar_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe.skip('Pushing bottom toolbar items.', function() { - var testFileName = 'bottom_toolbar.odt'; + var origTestFileName = 'bottom_toolbar.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/cursor_spec.js b/cypress_test/integration_tests/mobile/writer/cursor_spec.js index f899b1a07f..56e3e37942 100644 --- a/cypress_test/integration_tests/mobile/writer/cursor_spec.js +++ b/cypress_test/integration_tests/mobile/writer/cursor_spec.js @@ -8,8 +8,7 @@ describe('Text cursor tests.', function() { var testFileName; function before(fileName) { - testFileName = fileName; - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(fileName, 'writer'); mobileHelper.enableEditingMobile(); } diff --git a/cypress_test/integration_tests/mobile/writer/delete_objects_spec.js b/cypress_test/integration_tests/mobile/writer/delete_objects_spec.js index de35f5d97a..566b5034a2 100644 --- a/cypress_test/integration_tests/mobile/writer/delete_objects_spec.js +++ b/cypress_test/integration_tests/mobile/writer/delete_objects_spec.js @@ -4,7 +4,8 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Delete Objects', function() { - var testFileName = 'delete_objects.odt'; + var origTestFileName = 'delete_objects.odt'; + var testFileName; var eventOptions = { force: true, @@ -13,7 +14,7 @@ describe('Delete Objects', function() { }; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/focus_spec.js b/cypress_test/integration_tests/mobile/writer/focus_spec.js index e51ed1ee93..273e9dc55a 100644 --- a/cypress_test/integration_tests/mobile/writer/focus_spec.js +++ b/cypress_test/integration_tests/mobile/writer/focus_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Focus tests', function() { - var testFileName = 'focus.odt'; + var origTestFileName = 'focus.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js index 1eac6d89d2..39df3ef2c7 100644 --- a/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js +++ b/cypress_test/integration_tests/mobile/writer/hamburger_menu_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe('Trigger hamburger menu options.', function() { - var testFileName = 'hamburger_menu.odt'; + var origTestFileName = 'hamburger_menu.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); }); diff --git a/cypress_test/integration_tests/mobile/writer/image_operation_spec.js b/cypress_test/integration_tests/mobile/writer/image_operation_spec.js index 9186566307..038c7d1796 100644 --- a/cypress_test/integration_tests/mobile/writer/image_operation_spec.js +++ b/cypress_test/integration_tests/mobile/writer/image_operation_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe.skip('Image Operation Tests', function() { - var testFileName = 'annotation.odt'; + var origTestFileName = 'image_operation.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js index b3444b1f9e..b86d79cf0c 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_field_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_field_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe('Insert fields via insertion wizard.', function() { - var testFileName = 'insert_field.odt'; + var origTestFileName = 'insert_field.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js index 901f2f25e9..e88e2c545f 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_formatting_mark_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe('Insert formatting mark via insertion wizard.', function() { - var testFileName = 'insert_formatting_mark.odt'; + var origTestFileName = 'insert_formatting_mark.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js index 37b44f3ddd..8a42b6f945 100644 --- a/cypress_test/integration_tests/mobile/writer/insert_object_spec.js +++ b/cypress_test/integration_tests/mobile/writer/insert_object_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe('Insert objects via insertion wizard.', function() { - var testFileName = 'insert_object.odt'; + var origTestFileName = 'insert_object.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js index 9389f8d4d2..add69ea17d 100644 --- a/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js +++ b/cypress_test/integration_tests/mobile/writer/mobile_wizard_state_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Mobile wizard state tests', function() { - var testFileName = 'mobile_wizard_state.odt'; + var origTestFileName = 'mobile_wizard_state.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js b/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js index 88206922ae..80244d944d 100644 --- a/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js +++ b/cypress_test/integration_tests/mobile/writer/nextcloud_spec.js @@ -5,7 +5,8 @@ var mobileHelper = require('../../common/mobile_helper'); var nextcloudHelper = require('../../common/nextcloud_helper'); describe('Nextcloud specific tests.', function() { - var testFileName = 'nextcloud.odt'; + var origTestFileName = 'nextcloud.odt'; + var testFileName; afterEach(function() { helper.afterAll(testFileName, this.currentTest.state); @@ -14,7 +15,7 @@ describe('Nextcloud specific tests.', function() { it('Insert image from storage.', function() { helper.upLoadFileToNextCloud('image_to_insert.png', 'writer'); - helper.beforeAll(testFileName, 'writer', undefined, true); + testFileName = helper.beforeAll(origTestFileName, 'writer', undefined, true); mobileHelper.enableEditingMobile(); @@ -25,7 +26,7 @@ describe('Nextcloud specific tests.', function() { }); it('Save as.', function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); @@ -50,7 +51,7 @@ describe('Nextcloud specific tests.', function() { }); it('Share.', function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/searchbar_spec.js b/cypress_test/integration_tests/mobile/writer/searchbar_spec.js index a81b7482f7..90b35cf286 100644 --- a/cypress_test/integration_tests/mobile/writer/searchbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/searchbar_spec.js @@ -6,10 +6,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe('Searching via search bar.', function() { - var testFileName = 'search_bar.odt'; + var origTestFileName = 'search_bar.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js index d5dda50f43..182dadb9a6 100644 --- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js @@ -9,7 +9,8 @@ describe('Change shape properties via mobile wizard.', function() { const defaultAltitude = 5992; const unitScale = 2540.37; - var testFileName = 'shape_properties.odt'; + var origTestFileName = 'shape_properties.odt'; + var testFileName; class TriangleCoordinatesMatcher { /** @@ -62,7 +63,7 @@ describe('Change shape properties via mobile wizard.', function() { } beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js index ea0f7127d1..17de239c39 100644 --- a/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js +++ b/cypress_test/integration_tests/mobile/writer/spellchecking_spec.js @@ -5,10 +5,11 @@ var mobileHelper = require('../../common/mobile_helper'); var writerHelper = require('../../common/writer_helper'); describe.skip('Spell checking menu.', function() { - var testFileName = 'spellchecking.odt'; + var origTestFileName = 'spellchecking.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js index 0c7e2b535f..0a621e8aac 100644 --- a/cypress_test/integration_tests/mobile/writer/table_properties_spec.js +++ b/cypress_test/integration_tests/mobile/writer/table_properties_spec.js @@ -8,8 +8,7 @@ describe('Change table properties / layout via mobile wizard.', function() { var testFileName = ''; function before(testFile) { - testFileName = testFile; - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(testFile, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js index fc61874e9c..ca1abb689d 100644 --- a/cypress_test/integration_tests/mobile/writer/toolbar_spec.js +++ b/cypress_test/integration_tests/mobile/writer/toolbar_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Toolbar tests', function() { - var testFileName = 'toolbar.odt'; + var origTestFileName = 'toolbar.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); }); afterEach(function() { diff --git a/cypress_test/integration_tests/mobile/writer/track_changes_spec.js b/cypress_test/integration_tests/mobile/writer/track_changes_spec.js index 22f82aff48..5b8c40f07b 100644 --- a/cypress_test/integration_tests/mobile/writer/track_changes_spec.js +++ b/cypress_test/integration_tests/mobile/writer/track_changes_spec.js @@ -4,10 +4,11 @@ var helper = require('../../common/helper'); var mobileHelper = require('../../common/mobile_helper'); describe('Track Changes', function() { - var testFileName = 'track_changes.odt'; + var origTestFileName = 'track_changes.odt'; + var testFileName; beforeEach(function() { - helper.beforeAll(testFileName, 'writer'); + testFileName = helper.beforeAll(origTestFileName, 'writer'); // Click on edit button mobileHelper.enableEditingMobile(); diff --git a/cypress_test/plugins/tasks.js b/cypress_test/plugins/tasks.js index ec17a0001e..e8788866ca 100644 --- a/cypress_test/plugins/tasks.js +++ b/cypress_test/plugins/tasks.js @@ -6,7 +6,14 @@ var list = require('./selectorList').list; function copyFile(args) { return new Promise(function(resolve) { var sourceFile = args.sourceDir + args.fileName; - var destFile = args.destDir + args.fileName; + var destFileName; + if (args.destFileName) { + destFileName = args.destFileName; + } else { + destFileName = args.fileName; + } + + var destFile = args.destDir + destFileName; if (fs.existsSync(sourceFile)) { fs.mkdirSync(args.destDir, { recursive: true }); -- cgit