Cypress updates.

Signed-off-by: Gökay Şatır <gokaysatir@gmail.com>
Change-Id: Ieefdcae70be0fce920e2e2b3d3b6ba1b179a6857

4 files changed, 18 insertions, 28 deletions

diff --git a/browser/src/control/Control.JSDialogBuilder.js b/browser/src/control/Control.JSDialogBuilder.js
index d6c61b8ac0..edbab68aab 100644
--- a/browser/src/control/Control.JSDialogBuilder.js
+++ b/browser/src/control/Control.JSDialogBuilder.js
@@ -2480,7 +2480,7 @@ L.Control.JSDialogBuilder = L.Control.extend({
 		}
 
 		if (data.command || data.postmessage === true) {
-			var id = data.id ? data.id : (data.command && data.command !== '') ? data.command : data.text;
+			var id = data.id ? data.id : (data.command && data.command !== '') ? data.command.replace('.uno:', '') : data.text;
 			var isUnoCommand = data.command && data.command.indexOf('.uno:') >= 0;
 
 			isRealUnoCommand = isUnoCommand;
diff --git a/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js b/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js
index 3b683f86f3..ef937af35a 100644
--- a/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js
+++ b/cypress_test/integration_tests/desktop/calc/row_column_operation_spec.js
@@ -21,40 +21,40 @@ describe(['tagdesktop'], 'Row Column Operation', function() {
 
 	it('Insert/Delete row' , function() {
 		//Insert row above
-		cy.cGet('.cell.notebookbar #InsertColumnsBeforeimg').click();
+		cy.cGet('.cell.notebookbar #InsertColumnsBefore').click();
 
 		calcHelper.selectEntireSheet();
 		//calcHelper.assertDataClipboardTable(['','','Hello','Hi','World','Bye']);
 		//delete row
 		calcHelper.clickOnFirstCell(true, false);
 
-		cy.cGet('.cell.notebookbar #DeleteRowsimg').click();
+		cy.cGet('.cell.notebookbar #DeleteRows').click();
 		calcHelper.selectEntireSheet();
 		//calcHelper.assertDataClipboardTable(['Hello','Hi','World','Bye']);
 
 		//insert row below
 		calcHelper.clickOnFirstCell(true, false);
-		cy.cGet('.cell.notebookbar #InsertRowsAfterimg').click();
+		cy.cGet('.cell.notebookbar #InsertRowsAfter').click();
 		calcHelper.selectEntireSheet();
 		//calcHelper.assertDataClipboardTable(['Hello','Hi','','','World','Bye']);
 	});
 
 	it('Insert/Delete Column', function() {
 		//insert column before
-		cy.cGet('.cell.notebookbar #InsertColumnsBeforeimg').click();
+		cy.cGet('.cell.notebookbar #InsertColumnsBefore').click();
 		calcHelper.selectEntireSheet();
 		//calcHelper.assertDataClipboardTable(['','Hello','Hi','','World','Bye']);
 		calcHelper.clickOnFirstCell(true, false);
 
 		//delete column
-		cy.cGet('.cell.notebookbar #DeleteColumnsimg').click();
+		cy.cGet('.cell.notebookbar #DeleteColumns').click();
 		calcHelper.selectEntireSheet();
 		cy.wait(500);
 		//calcHelper.assertDataClipboardTable(['Hello','Hi','World','Bye']);
 		calcHelper.clickOnFirstCell(true,false);
 
 		//insert column after
-		cy.cGet('.cell.notebookbar #InsertColumnsAfterimg').click();
+		cy.cGet('.cell.notebookbar #InsertColumnsAfter').click();
 		calcHelper.selectEntireSheet();
 		//calcHelper.assertDataClipboardTable(['Hello','','Hi','World','','Bye']);
 	});
diff --git a/cypress_test/integration_tests/desktop/impress/annotation_spec.js b/cypress_test/integration_tests/desktop/impress/annotation_spec.js
index b4c0bcc6eb..c3d66bb9c6 100644
--- a/cypress_test/integration_tests/desktop/impress/annotation_spec.js
+++ b/cypress_test/integration_tests/desktop/impress/annotation_spec.js
@@ -16,12 +16,9 @@ describe(['tagdesktop'], 'Annotation Tests', function() {
 
 		if (Cypress.env('INTEGRATION') === 'nextcloud') {
 			desktopHelper.hideSidebarIfVisible();
-		} else if (Cypress.env('USER_INTERFACE') === 'notebookbar') {
-			cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click();
-		} else {
-			desktopHelper.hideSidebar();
 		}
 
+		cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click();
 		desktopHelper.selectZoomLevel('50');
 	});
 
@@ -78,12 +75,9 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() {
 
 		if (Cypress.env('INTEGRATION') === 'nextcloud') {
 			desktopHelper.hideSidebarIfVisible();
-		} else if (Cypress.env('USER_INTERFACE') === 'notebookbar') {
-			cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click();
-		} else {
-			desktopHelper.hideSidebar();
 		}
 
+		cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click();
 		desktopHelper.selectZoomLevel('50');
 	});
 
@@ -92,13 +86,13 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() {
 	});
 
 	it('Insert', function() {
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		cy.cGet('.leaflet-marker-icon').should('exist');
 		cy.cGet('.cool-annotation-content > div').should('contain','some text');
 	});
 
 	it('Modify', function() {
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		cy.cGet('.leaflet-marker-icon').should('exist');
 		cy.cGet('#annotation-content-area-1').should('contain','some text0');
 		cy.cGet('.avatar-img').click();
@@ -112,7 +106,7 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() {
 	});
 
 	it('Remove',function() {
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		cy.cGet('.leaflet-marker-icon').should('exist');
 		cy.cGet('.cool-annotation-content > div').should('contain','some text');
 		cy.cGet('.avatar-img').click();
@@ -122,7 +116,7 @@ describe(['tagdesktop'], 'Collapsed Annotation Tests', function() {
 	});
 
 	it('Reply',function() {
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		cy.cGet('.leaflet-marker-icon').should('exist');
 		cy.cGet('.cool-annotation-content > div').should('contain','some text');
 		cy.cGet('.avatar-img').click();
@@ -142,11 +136,7 @@ describe(['tagdesktop'], 'Comment Scrolling',function() {
 		testFileName = helper.beforeAll(origTestFileName, 'impress');
 		desktopHelper.switchUIToNotebookbar();
 
-		if (Cypress.env('USER_INTERFACE') === 'notebookbar') {
-			cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click();
-		} else {
-			desktopHelper.hideSidebar();
-		}
+		cy.cGet('.unospan-optionstoolboxdown.unoModifyPage').click();
 		desktopHelper.selectZoomLevel('50');
 	});
 
@@ -156,15 +146,15 @@ describe(['tagdesktop'], 'Comment Scrolling',function() {
 
 	it('no comment or one comment', function() {
 		cy.cGet('.leaflet-control-scroll-down').should('not.exist');
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		cy.cGet('.leaflet-marker-icon').should('exist');
 	});
 
 	it('omit slides without comments', function() {
 		//scroll up
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		addSlide(2);
-		insertMultipleComment('impress', 1, false);
+		insertMultipleComment('impress');
 		helper.waitUntilIdle('.leaflet-control-scroll-up');
 		cy.cGet('.leaflet-control-scroll-up').should('be.visible');
 		cy.cGet('.leaflet-control-scroll-up').click().wait(300);
diff --git a/cypress_test/plugins/selectorList.js b/cypress_test/plugins/selectorList.js
index b079ce7fcb..6e6484c967 100644
--- a/cypress_test/plugins/selectorList.js
+++ b/cypress_test/plugins/selectorList.js
@@ -16,7 +16,7 @@ module.exports.list = {
 	bulletList: ['#DefaultBullet', '#tb_editbar_item_defaultbullet'],
 	incrementIndent: ['#IncrementIndent', '#tb_editbar_item_incrementindent'],
 	decrementIndent: ['#DecrementIndent', '#tb_editbar_item_decrementindent'],
-	insertAnnotation: ['#InsertAnnotationimg', '#tb_editbar_item_insertannotation'],
+	insertAnnotation: ['#InsertAnnotation', '#tb_editbar_item_insertannotation'],
 	insertTable: ['#InsertTable', '#tb_editbar_item_inserttable'],
 	insertGraphic: ['#InsertGraphic', '#tb_editbar_item_insertgraphic'],
 	clearFormat: ['#Home .unoResetAttributes', '#tb_editbar_item_reset'],