diff options
author | Marco Cecchetti <marco.cecchetti@collabora.com> | 2023-06-09 11:14:27 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2023-06-15 08:54:51 +0100 |
commit | 39be94e8525aac5b97458d8f7a2e97b390399e8e (patch) | |
tree | aa47e525392d5f9e7bfeb179820bb7545d791beb /cypress_test/integration_tests/desktop/calc | |
parent | When Calc starts with the notebook ui, sheet tabs are missing (diff) | |
download | online-39be94e8525aac5b97458d8f7a2e97b390399e8e.tar.gz online-39be94e8525aac5b97458d8f7a2e97b390399e8e.zip |
Force notebookbar ui when a11y is enabled
When accessibility is enabled in coolwsd.xml, overrides setting in
<user-interface> section by force to use the notebookbar UI.
Signed-off-by: Marco Cecchetti <marco.cecchetti@collabora.com>
Change-Id: I98f4b288439b21110214ca2a67df639b397184c9
Diffstat (limited to 'cypress_test/integration_tests/desktop/calc')
5 files changed, 9 insertions, 2 deletions
diff --git a/cypress_test/integration_tests/desktop/calc/autofilter_spec.js b/cypress_test/integration_tests/desktop/calc/autofilter_spec.js index 6498f9711a..3f1441163b 100644 --- a/cypress_test/integration_tests/desktop/calc/autofilter_spec.js +++ b/cypress_test/integration_tests/desktop/calc/autofilter_spec.js @@ -2,6 +2,7 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); +var desktopHelper = require('../../common/desktop_helper'); describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'AutoFilter', function() { var origTestFileName = 'autofilter.ods'; @@ -9,6 +10,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'AutoFilter', function() { beforeEach(function() { testFileName = helper.beforeAll(origTestFileName, 'calc'); + desktopHelper.switchUIToCompact(); toggleAutofilter(); calcHelper.selectEntireSheet(); calcHelper.assertDataClipboardTable(['Cypress Test', 'Status', 'Test 1', 'Pass', 'Test 2', 'Fail', 'Test 3', 'Pass', 'Test 4', '', 'Test 5', 'Fail']); 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 3930fe232c..a8e584650d 100644 --- a/cypress_test/integration_tests/desktop/calc/delete_objects_spec.js +++ b/cypress_test/integration_tests/desktop/calc/delete_objects_spec.js @@ -1,5 +1,6 @@ /* global describe it cy require afterEach beforeEach expect Cypress*/ var helper = require('../../common/helper'); +const desktopHelper = require('../../common/desktop_helper'); describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Delete Objects', function() { var origTestFileName = 'delete_objects.ods'; @@ -7,6 +8,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Delete Objects', function( beforeEach(function() { testFileName = helper.beforeAll(origTestFileName, 'calc'); + desktopHelper.switchUIToCompact(); }); afterEach(function() { diff --git a/cypress_test/integration_tests/desktop/calc/scrolling_spec.js b/cypress_test/integration_tests/desktop/calc/scrolling_spec.js index 64160e522e..b094ec6526 100644 --- a/cypress_test/integration_tests/desktop/calc/scrolling_spec.js +++ b/cypress_test/integration_tests/desktop/calc/scrolling_spec.js @@ -8,6 +8,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Scroll through document', beforeEach(function() { helper.beforeAll(testFileName, 'calc'); + desktopHelper.switchUIToCompact(); cy.cGet('#toolbar-up .w2ui-scroll-right').click(); cy.cGet('#tb_editbar_item_sidebar').click(); }); @@ -19,7 +20,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Scroll through document', it('Scrolling to bottom/top', function() { desktopHelper.assertScrollbarPosition('vertical', 19, 21); desktopHelper.pressKey(3,'pagedown'); - desktopHelper.assertScrollbarPosition('vertical', 191, 230); + desktopHelper.assertScrollbarPosition('vertical', 170, 200); desktopHelper.pressKey(3,'pageup'); desktopHelper.assertScrollbarPosition('vertical', 19, 21); }); 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 ba7c30ef3f..d4729add55 100644 --- a/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js @@ -10,7 +10,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() { beforeEach(function() { testFileName = helper.beforeAll(origTestFileName, 'calc'); - + desktopHelper.switchUIToCompact(); calcHelper.clickOnFirstCell(); }); diff --git a/cypress_test/integration_tests/desktop/calc/undo_redo_spec.js b/cypress_test/integration_tests/desktop/calc/undo_redo_spec.js index 7e0d644df6..7e343cc44a 100644 --- a/cypress_test/integration_tests/desktop/calc/undo_redo_spec.js +++ b/cypress_test/integration_tests/desktop/calc/undo_redo_spec.js @@ -3,12 +3,14 @@ var helper = require('../../common/helper'); var calcHelper = require('../../common/calc_helper'); var repairHelper = require('../../common/repair_document_helper'); +const desktopHelper = require('../../common/desktop_helper'); describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Editing Operations', function() { var testFileName = 'undo_redo.ods'; beforeEach(function() { helper.beforeAll(testFileName, 'calc'); + desktopHelper.switchUIToCompact(); }); afterEach(function() { |