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

17 files changed, 30 insertions, 4 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() {
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 932394cdc0..98c20c21a3 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
@@ -2,6 +2,7 @@
 
 var helper = require('../../common/helper');
 var impressHelper = require('../../common/impress_helper');
+const desktopHelper = require('../../common/desktop_helper');
 
 describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Apply paragraph properties on selected shape.', function() {
 	var origTestFileName = 'apply_paragraph_props_text.odp';
@@ -9,6 +10,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Apply paragraph properties
 
 	beforeEach(function() {
 		testFileName = helper.beforeAll(origTestFileName, 'impress');
+		desktopHelper.switchUIToCompact();
 		cy.cGet('#toolbar-up > .w2ui-scroll-right').click();
 		cy.cGet('#tb_editbar_item_modifypage').click();
 		impressHelper.selectTextShapeInTheCenter();
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 ee4ad0d29a..eca040b37a 100644
--- a/cypress_test/integration_tests/desktop/impress/delete_objects_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/delete_objects_spec.js
@@ -9,6 +9,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Delete Objects', function(
 
 	beforeEach(function() {
 		testFileName = helper.beforeAll(origTestFileName, 'impress');
+		desktopHelper.switchUIToCompact();
 	});
 
 	afterEach(function() {
@@ -28,6 +29,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Delete Objects', function(
 
 	it('Delete Shapes', function() {
 		cy.cGet('#toolbar-up > .w2ui-scroll-right').click();
+		cy.wait(1000);
 		//insert
 		cy.cGet('#tb_editbar_item_insertshapes').click();
 		cy.cGet('.col.w2ui-icon.symbolshapes').should($el => { expect(Cypress.dom.isDetached($el)).to.eq(false); }).click();
diff --git a/cypress_test/integration_tests/desktop/impress/scrolling_spec.js b/cypress_test/integration_tests/desktop/impress/scrolling_spec.js
index bbcef0a202..2031f198a7 100644
--- a/cypress_test/integration_tests/desktop/impress/scrolling_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/scrolling_spec.js
@@ -8,6 +8,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Scroll through document',
 
 	beforeEach(function() {
 		helper.beforeAll(testFileName, 'impress');
+		desktopHelper.switchUIToCompact();
 		cy.cGet('#toolbar-up .w2ui-scroll-right').click();
 		cy.cGet('#tb_editbar_item_modifypage').click();
 		desktopHelper.selectZoomLevel('200');
diff --git a/cypress_test/integration_tests/desktop/impress/sidebar_spec.js b/cypress_test/integration_tests/desktop/impress/sidebar_spec.js
index 8894072a8c..74eb7644ae 100644
--- a/cypress_test/integration_tests/desktop/impress/sidebar_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/sidebar_spec.js
@@ -2,12 +2,14 @@
 
 var helper = require('../../common/helper');
 var impressHelper = require('../../common/impress_helper');
+const desktopHelper = require('../../common/desktop_helper');
 
 describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sidebar Tests', function() {
 	var testFileName = 'sidebar.odp';
 
 	beforeEach(function() {
 		helper.beforeAll(testFileName, 'impress');
+		desktopHelper.switchUIToCompact();
 	});
 
 	afterEach(function() {
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 96579ef899..0722d742f7 100644
--- a/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js
@@ -10,6 +10,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct
 
 	beforeEach(function() {
 		testFileName = helper.beforeAll(origTestFileName, 'impress');
+		desktopHelper.switchUIToCompact();
 
 		if (Cypress.env('INTEGRATION') === 'nextcloud') {
 			desktopHelper.hideSidebarIfVisible();
diff --git a/cypress_test/integration_tests/desktop/impress/undo_redo_spec.js b/cypress_test/integration_tests/desktop/impress/undo_redo_spec.js
index 4f80b822b9..2f5fdb687f 100644
--- a/cypress_test/integration_tests/desktop/impress/undo_redo_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/undo_redo_spec.js
@@ -10,6 +10,7 @@ describe(['tagdesktop'], 'Editing Operations', function() {
 
 	beforeEach(function() {
 		helper.beforeAll(testFileName, 'impress');
+		desktopHelper.switchUIToCompact();
 		desktopHelper.selectZoomLevel('30');
 		impressHelper.selectTextShapeInTheCenter();
 		impressHelper.selectTextOfShape(false);
diff --git a/cypress_test/integration_tests/desktop/writer/file_properties_spec.js b/cypress_test/integration_tests/desktop/writer/file_properties_spec.js
index cd86f6d8e9..5b743de2a7 100644
--- a/cypress_test/integration_tests/desktop/writer/file_properties_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/file_properties_spec.js
@@ -2,6 +2,7 @@
 
 var helper = require('../../common/helper');
 var writerHelper = require('../../common/writer_helper');
+const desktopHelper = require('../../common/desktop_helper');
 
 describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', function() {
 	var origTestFileName = 'file_properties.odt';
@@ -9,6 +10,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'File Property Tests', func
 
 	beforeEach(function() {
 		testFileName = helper.beforeAll(origTestFileName, 'writer');
+		desktopHelper.switchUIToCompact();
 	});
 
 	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 7733f31b35..be4f5c26a3 100644
--- a/cypress_test/integration_tests/desktop/writer/focus_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/focus_spec.js
@@ -1,6 +1,7 @@
 /* global describe it cy beforeEach require afterEach */
 
 var helper = require('../../common/helper');
+const desktopHelper = require('../../common/desktop_helper');
 
 describe(['tagdesktop', 'tagproxy'], 'Focus tests', function() {
 	var origTestFileName = 'focus.odt';
@@ -8,6 +9,7 @@ describe(['tagdesktop', 'tagproxy'], 'Focus tests', function() {
 
 	beforeEach(function() {
 		testFileName = helper.beforeAll(origTestFileName, 'writer');
+		desktopHelper.switchUIToCompact();
 	});
 
 	afterEach(function() {
diff --git a/cypress_test/integration_tests/desktop/writer/scrolling_spec.js b/cypress_test/integration_tests/desktop/writer/scrolling_spec.js
index db35a2daf8..ac8b74f055 100644
--- a/cypress_test/integration_tests/desktop/writer/scrolling_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/scrolling_spec.js
@@ -8,6 +8,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Scroll through document',
 
 	beforeEach(function() {
 		helper.beforeAll(testFileName, 'writer');
+		desktopHelper.switchUIToCompact();
 
 		cy.cGet('#toolbar-up .w2ui-scroll-right').click();
 		cy.cGet('#tb_editbar_item_sidebar').click();
diff --git a/cypress_test/integration_tests/desktop/writer/statusbar_spec.js b/cypress_test/integration_tests/desktop/writer/statusbar_spec.js
index c32d2e5b07..70b66e2be4 100644
--- a/cypress_test/integration_tests/desktop/writer/statusbar_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/statusbar_spec.js
@@ -9,6 +9,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Statubar tests.', function
 
 	beforeEach(function() {
 		testFileName = helper.beforeAll(origTestFileName, 'writer');
+		desktopHelper.switchUIToCompact();
 
 		if (Cypress.env('INTEGRATION') === 'nextcloud') {
 			desktopHelper.showStatusBarIfHidden ();
@@ -29,11 +30,11 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Statubar tests.', function
 		cy.cGet('#StatePageNumber').should('have.text', 'Page 1 of 1');
 		cy.cGet('#menu-insert').click();
 		cy.cGet('body').contains('#menu-insert li a', 'Page Break').click();
-		cy.cGet('#StatePageNumber').should('have.text', 'Pages 1 and 2 of 2');
+		cy.cGet('#StatePageNumber').should('have.text', 'Page 2 of 2');
 		cy.cGet('#tb_actionbar_item_prev').click();
 		cy.cGet('#StatePageNumber').should('have.text', 'Page 1 of 2');
 		cy.cGet('#tb_actionbar_item_next').click();
-		cy.cGet('#StatePageNumber').should('have.text', 'Pages 1 and 2 of 2');
+		cy.cGet('#StatePageNumber').should('have.text', 'Page 2 of 2');
 	});
 
 	it('Text entering mode.', function() {
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 8f0d121943..92ad3daa5e 100644
--- a/cypress_test/integration_tests/desktop/writer/track_changes_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/track_changes_spec.js
@@ -1,6 +1,7 @@
 /* global describe it cy beforeEach require afterEach Cypress expect */
 
 var helper = require('../../common/helper');
+const desktopHelper = require('../../common/desktop_helper');
 
 describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Track Changes', function () {
 	var origTestFileName = 'track_changes.odt';
@@ -8,6 +9,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Track Changes', function (
 
 	beforeEach(function () {
 		testFileName = helper.beforeAll(origTestFileName, 'writer');
+		desktopHelper.switchUIToCompact();
 	});
 
 	afterEach(function () {
diff --git a/cypress_test/integration_tests/desktop/writer/undo_redo_spec.js b/cypress_test/integration_tests/desktop/writer/undo_redo_spec.js
index ad1d3c0d3d..0c91d676aa 100644
--- a/cypress_test/integration_tests/desktop/writer/undo_redo_spec.js
+++ b/cypress_test/integration_tests/desktop/writer/undo_redo_spec.js
@@ -2,12 +2,14 @@
 
 var helper = require('../../common/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.odt';
 
 	beforeEach(function() {
 		helper.beforeAll(testFileName, 'writer');
+		desktopHelper.switchUIToCompact();
 	});
 
 	afterEach(function() {