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

6 files changed, 12 insertions, 2 deletions

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() {