cypress: use helper for toolbar items in Calc

Signed-off-by: Szymon Kłos <[email protected]>
Change-Id: Ibd36a8bc98bf864944ebbe6e4fd28fe597dccad1

Author: eszkadev

cypress_test/integration_tests/common/desktop_helper.js

@@ -548,6 +548,11 @@ function getNbIcon(unoCommand, tabName) {
 	return cy.cGet((tabName ? '#' + tabName + '-container' : '') + '.notebookbar  .uno' + unoCommand + ' > button:visible');
 }
 
+/// get icon arrow for given uno command from classic toolbar to open the dropdown
+function getCompactIconArrow(unoCommand) {
+	return cy.cGet('#toolbar-up .uno' + unoCommand + ' > .arrowbackground:visible');
+}
+
 /// get icon arrow for given uno command from notebookbar to open the dropdown
 function getNbIconArrow(unoCommand, tabName) {
 	return cy.cGet((tabName ? '#' + tabName + '-container' : '') + '.notebookbar  .uno' + unoCommand + ' > .arrowbackground:visible');
@@ -593,5 +598,6 @@ module.exports.closeNavigatorSidebar = closeNavigatorSidebar;
 module.exports.sidebarToggle = sidebarToggle;
 module.exports.getCompactIcon = getCompactIcon;
 module.exports.getNbIcon = getNbIcon;
+module.exports.getCompactIconArrow = getCompactIconArrow;
 module.exports.getNbIconArrow = getNbIconArrow;
 module.exports.getDropdown = getDropdown;

cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js

@@ -118,7 +118,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 		// Despite the selection is there, merge cells needs more time here.
 		cy.wait(1000);
 
-		cy.cGet('#toolbar-up #togglemergecells').click();
+		desktopHelper.getCompactIcon('ToggleMergeCells').click();
 
 		desktopHelper.checkDialogAndClose('Merge Cells');
 	});
@@ -131,7 +131,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 		helper.copy();
 
 		cy.cGet('#copy-paste-container table td b').should('exist');
-		cy.cGet('#reset').click();
+		desktopHelper.getCompactIcon('ResetAttributes').click();
 
 		calcHelper.selectEntireSheet();
 		helper.copy();
@@ -191,7 +191,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 
 	it('Apply highlight color.', function() {
 		helper.setDummyClipboardForCopy();
-		cy.cGet('#backgroundcolor .arrowbackground').click();
+		desktopHelper.getCompactIconArrow('BackgroundColor').click();
 		desktopHelper.selectColorFromPalette('3FAF46');
 		calcHelper.selectEntireSheet();
 		helper.copy();
@@ -200,7 +200,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 
 	it('Apply font color.', function() {
 		helper.setDummyClipboardForCopy();
-		cy.cGet('#fontcolor .arrowbackground').click();
+		desktopHelper.getCompactIconArrow('Color').click();
 		desktopHelper.selectColorFromPalette('FFB66C');
 		calcHelper.selectEntireSheet();
 		helper.copy();
@@ -210,8 +210,8 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 	it('Add/Delete decimal places', function() {
 		helper.setDummyClipboardForCopy();
 		// Add decimal place
-		cy.cGet('#toolbar-up #overflow-button-other-toptoolbar .arrowbackground').click();
-		cy.cGet('#numberformatincdecimals').click();
+		desktopHelper.getCompactIconArrow('DefaultNumbering').click();
+		desktopHelper.getCompactIcon('NumberFormatIncDecimals').click();
 		calcHelper.selectEntireSheet();
 		helper.copy();
 
@@ -223,8 +223,8 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 		// Delete Decimal place
 		calcHelper.clickOnFirstCell();
 
-		cy.cGet('#toolbar-up #overflow-button-other-toptoolbar .arrowbackground').click();
-		cy.cGet('#numberformatdecdecimals').click();
+		desktopHelper.getCompactIconArrow('DefaultNumbering').click();
+		desktopHelper.getCompactIcon('NumberFormatDecDecimals').click();
 
 		calcHelper.selectEntireSheet();
 		helper.copy();
@@ -236,7 +236,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 
 	it('Format as currency.', function() {
 		helper.setDummyClipboardForCopy();
-		cy.cGet('#toolbar-up #overflow-button-other-toptoolbar .arrowbackground').click();
+		desktopHelper.getCompactIconArrow('DefaultNumbering').click();
 		desktopHelper.getCompactIcon('NumberFormatCurrency').click();
 
 		calcHelper.selectEntireSheet();
@@ -250,7 +250,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 
 	it('Format as Percent.', function() {
 		helper.setDummyClipboardForCopy();
-		cy.cGet('#toolbar-up #overflow-button-other-toptoolbar .arrowbackground').click();
+		desktopHelper.getCompactIconArrow('DefaultNumbering').click();
 		desktopHelper.getCompactIcon('NumberFormatPercent').click();
 
 		calcHelper.selectEntireSheet();