diff options
| author | Tamás Zolnai <tamas.zolnai@collabora.com> | 2020-11-18 11:25:25 +0100 |
|---|---|---|
| committer | Tamás Zolnai <zolnaitamas2000@gmail.com> | 2020-11-18 12:04:22 +0100 |
| commit | d38360ff74737b5ae12422ebaa4344131f337092 (patch) | |
| tree | 8e3044f79fb593da54320a354ca01a3f21f34331 /cypress_test | |
| parent | cypress: selectAllMobile() -> selectEntireSheet(). (diff) | |
| download | online-d38360ff74737b5ae12422ebaa4344131f337092.tar.gz online-d38360ff74737b5ae12422ebaa4344131f337092.zip | |
cypress: extract selectColorFromPalette() method.
Change-Id: I6ce70b2ee51dde2c6449236d911519776f75f892
Signed-off-by: Tamás Zolnai <tamas.zolnai@collabora.com>
Diffstat (limited to 'cypress_test')
3 files changed, 18 insertions, 8 deletions
diff --git a/cypress_test/integration_tests/common/desktop_helper.js b/cypress_test/integration_tests/common/desktop_helper.js index ed53656292..9f9d0731e0 100644 --- a/cypress_test/integration_tests/common/desktop_helper.js +++ b/cypress_test/integration_tests/common/desktop_helper.js @@ -72,8 +72,20 @@ function hideSidebarIfVisible() { }); } +function selectColorFromPalette(color) { + cy.get('.w2ui-overlay') + .should('be.visible'); + + cy.get('.w2ui-color [name="' + color + '"]') + .click(); + + cy.get('.w2ui-overlay') + .should('not.exist'); +} + module.exports.showSidebar = showSidebar; module.exports.hideSidebar = hideSidebar; module.exports.showStatusBarIfHidden = showStatusBarIfHidden; module.exports.showSidebarIfHidden = showSidebarIfHidden; module.exports.hideSidebarIfVisible = hideSidebarIfVisible; +module.exports.selectColorFromPalette = selectColorFromPalette; 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 5bc2ff8510..f3e029de4d 100644 --- a/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/calc/top_toolbar_spec.js @@ -1,6 +1,7 @@ /* global describe it cy beforeEach require afterEach expect*/ var helper = require('../../common/helper'); +var desktopHelper = require('../../common/desktop_helper'); var calcHelper = require('../../common/calc_helper'); describe('Top toolbar tests.', function() { @@ -321,8 +322,8 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_backgroundcolor') .click(); - cy.get('.w2ui-color [name="8E7CC3"]') - .click(); + desktopHelper.selectColorFromPalette('8E7CC3'); + calcHelper.selectEntireSheet(); cy.get('#copy-paste-container table td') @@ -333,8 +334,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_fontcolor') .click(); - cy.get('.w2ui-color [name="FFF2CC"]') - .click(); + desktopHelper.selectColorFromPalette('FFF2CC'); calcHelper.selectEntireSheet(); diff --git a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js index fa1ec4f3cf..649ce8ea69 100644 --- a/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/writer/top_toolbar_spec.js @@ -25,8 +25,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_backcolor') .click(); - cy.get('.w2ui-color [name="FFF2CC"]') - .click(); + desktopHelper.selectColorFromPalette('FFF2CC'); writerHelper.selectAllTextOfDoc(); @@ -38,8 +37,7 @@ describe('Top toolbar tests.', function() { cy.get('#tb_editbar_item_fontcolor') .click(); - cy.get('.w2ui-color [name="8E7CC3"]') - .click(); + desktopHelper.selectColorFromPalette('8E7CC3'); writerHelper.selectAllTextOfDoc(); |