cypress: use helper to get dropdowns in notebookbar

- do not use id which is not stable, use uno command class

Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I873e32b91524e5f9d8ac0c9eae6e4f0a2259a075

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 notebookbar to open the dropdown
+function getNbIconArrow(unoCommand, tabName) {
+	return cy.cGet((tabName ? '#' + tabName + '-container' : '') + '.notebookbar  .uno' + unoCommand + ' > .arrowbackground:visible');
+}
+
 /// get gropdown element for menu with given id
 function getDropdown(dropdownId) {
 	return cy.cGet('[id^="' + dropdownId + '"].modalpopup');
@@ -587,5 +592,6 @@ module.exports.assertVisiblePage = assertVisiblePage;
 module.exports.closeNavigatorSidebar = closeNavigatorSidebar;
 module.exports.sidebarToggle = sidebarToggle;
 module.exports.getCompactIcon = getCompactIcon;
-module.exports.getNbIcon = getNbIcon; 
+module.exports.getNbIcon = getNbIcon;
+module.exports.getNbIconArrow = getNbIconArrow;
 module.exports.getDropdown = getDropdown;

cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js

@@ -8,9 +8,9 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 	var newFilePath;
 
 	beforeEach(function() {
+		cy.viewport(1920,1080);
 		newFilePath = helper.setupAndLoadDocument('writer/top_toolbar.odt');
 		desktopHelper.switchUIToNotebookbar();
-		cy.viewport(1920,1080);
 
 		if (Cypress.env('INTEGRATION') === 'nextcloud') {
 			desktopHelper.showSidebar();
@@ -26,7 +26,7 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 
 	it('Apply highlight color.', function() {
 		helper.setDummyClipboardForCopy();
-		desktopHelper.actionOnSelector('backColor', (selector) => { cy.cGet(selector).click(); });
+		desktopHelper.getNbIconArrow('CharBackColor', 'Home').click();
 		desktopHelper.selectColorFromPalette('FFB66C');
 		writerHelper.selectAllTextOfDoc();
 		helper.copy();
@@ -36,20 +36,18 @@ describe(['tagdesktop'], 'Top toolbar tests.', function() {
 
 	it('Apply transparent highlight color.', function() {
 		helper.setDummyClipboardForCopy();
-		desktopHelper.actionOnSelector('backColor',
-			(selector) => { cy.cGet(selector.replace('.unoarrow', '') + ' .unobutton').click(); });
+		desktopHelper.getNbIcon('CharBackColor', 'Home').first().click();
 		writerHelper.selectAllTextOfDoc();
 		helper.copy();
 		cy.cGet('#copy-paste-container p font span')
 			.should('have.attr', 'style', 'background: transparent');
-		desktopHelper.actionOnSelector('backColor',
-			(selector) => { cy.cGet(selector.replace('.unoarrow', '') + ' .selected-color')
-				.should('have.attr', 'style', 'background-color: transparent; border-color: var(--color-border);') });
+		desktopHelper.getNbIcon('CharBackColor').find('.selected-color')
+				.should('have.attr', 'style', 'background-color: transparent; border-color: var(--color-border);');
 	});
 
 	it('Apply font color.', function() {
 		helper.setDummyClipboardForCopy();
-		desktopHelper.actionOnSelector('fontColor', (selector) => { cy.cGet(selector).click(); });
+		desktopHelper.getNbIconArrow('FontColor', 'Home').click();
 		desktopHelper.selectColorFromPalette('3FAF46');
 		writerHelper.selectAllTextOfDoc();
 		helper.copy();