diff options
author | Szymon Kłos <szymon.klos@collabora.com> | 2023-08-11 20:55:44 +0200 |
---|---|---|
committer | Szymon Kłos <eszkadev@gmail.com> | 2023-08-12 10:34:15 +0200 |
commit | b85eb1b03fdccbeff2367ab8c92af6f99051f4ba (patch) | |
tree | ad71ab87b0d8578d543e46a3bd8c8fe2b750c742 | |
parent | FIX #7037: JSDialog: label vs textarea vs input field inconsistent paddings (diff) | |
download | online-b85eb1b03fdccbeff2367ab8c92af6f99051f4ba.tar.gz online-b85eb1b03fdccbeff2367ab8c92af6f99051f4ba.zip |
cypress: fix svg text-decoration detection
this was changed in the core:
commit 0a549b2c9595cd076e3b503b67df93bff380885a
svg: export text decoration for text run not paragraph
Signed-off-by: Szymon Kłos <szymon.klos@collabora.com>
Change-Id: I8906ee07c7ff88c9dcdbebe73d2c620e797a8b3a
4 files changed, 35 insertions, 35 deletions
diff --git a/cypress_test/integration_tests/desktop/impress/sidebar_spec.js b/cypress_test/integration_tests/desktop/impress/sidebar_spec.js index 74eb7644ae..f7a69c0463 100644 --- a/cypress_test/integration_tests/desktop/impress/sidebar_spec.js +++ b/cypress_test/integration_tests/desktop/impress/sidebar_spec.js @@ -47,7 +47,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Sidebar Tests', function() cy.cGet('.modalpopup .jsdialog-container').should('be.visible'); cy.cGet('#single').click(); impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'underline'); }); }); diff --git a/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js b/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js index 0722d742f7..bba7402dd6 100644 --- a/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js +++ b/cypress_test/integration_tests/desktop/impress/top_toolbar_spec.js @@ -30,7 +30,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-weight', '700'); }); @@ -39,7 +39,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-style', 'italic'); }); @@ -49,7 +49,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'underline'); }); @@ -58,7 +58,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'line-through'); }); @@ -95,7 +95,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .SVGTextShape .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .SVGTextShape .TextParagraph .TextPosition tspan') .should('have.attr', 'font-family', 'Liberation Mono'); }); @@ -107,7 +107,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct impressHelper.triggerNewSVGForShapeInTheCenter(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .SVGTextShape .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .SVGTextShape .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '776px'); }); @@ -140,7 +140,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '8643'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '1129px'); helper.typeIntoDocument('{ctrl}{shift}p'); @@ -150,7 +150,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '8271'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '655px'); }); @@ -160,7 +160,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '8643'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '1129px'); helper.typeIntoDocument('{ctrl}{shift}b'); @@ -170,7 +170,7 @@ describe(['tagdesktop', 'tagnextcloud', 'tagproxy'], 'Top toolbar tests.', funct cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '8734'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '655px'); }); }); diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js b/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js index 196fefc699..4c9b979516 100644 --- a/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js +++ b/cypress_test/integration_tests/mobile/impress/apply_font_shape_spec.js @@ -32,7 +32,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-weight', '700'); }); @@ -43,7 +43,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-style', 'italic'); }); @@ -54,7 +54,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'underline'); }); @@ -65,7 +65,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'line-through'); }); @@ -87,7 +87,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-family', 'Linux Libertine G'); }); @@ -98,7 +98,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '847px'); }); @@ -121,7 +121,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap it('Apply highlight on text shape.', function() { mobileHelper.openTextPropertiesPanel(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('not.have.attr', 'font-color'); helper.clickOnIdle('#CharBackColor'); @@ -146,7 +146,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3495'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '635px'); helper.clickOnIdle('#SuperScript'); @@ -155,7 +155,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3285'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '368px'); }); @@ -164,7 +164,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3495'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '635px'); helper.clickOnIdle('#SubScript'); @@ -173,7 +173,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3705'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '368px'); }); @@ -181,14 +181,14 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap mobileHelper.openTextPropertiesPanel(); // Change the font size first - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '635px'); helper.clickOnIdle('#SuperScript'); triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '368px'); // Remove direct formatting @@ -198,7 +198,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected shap triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '635px'); }); }); diff --git a/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js b/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js index 9e14900839..906405446a 100644 --- a/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js +++ b/cypress_test/integration_tests/mobile/impress/apply_font_text_spec.js @@ -34,7 +34,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-weight', '700'); }); @@ -47,7 +47,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-style', 'italic'); }); @@ -60,7 +60,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'underline'); }); @@ -73,7 +73,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'text-decoration', 'line-through'); }); @@ -98,7 +98,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-family', 'Linux Libertine G'); }); @@ -110,7 +110,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text triggerNewSVG(); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '847px'); }); @@ -164,7 +164,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3495'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '635px'); helper.clickOnIdle('.unoSuperScript'); @@ -173,7 +173,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3285'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '368px'); }); @@ -184,7 +184,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3495'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '635px'); helper.clickOnIdle('.unoSubScript'); @@ -193,7 +193,7 @@ describe(['tagmobile', 'tagnextcloud', 'tagproxy'], 'Apply font on selected text cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextPosition') .should('have.attr', 'y', '3546'); - cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph') + cy.cGet('.leaflet-pane.leaflet-overlay-pane g.Page .TextParagraph .TextPosition tspan') .should('have.attr', 'font-size', '368px'); }); }); |