[Libreoffice-commits] online.git: 2 commits - cypress_test/integration_tests test/UnitWOPISaveAs.cpp

[Tamás Zolnai (via logerrit)]

 cypress_test/integration_tests/mobile/writer/shape_properties_spec.js |   12 +++++-----
 test/UnitWOPISaveAs.cpp                                               |   12 ++--------
 2 files changed, 9 insertions(+), 15 deletions(-)

New commits:
commit 96b81b18d07787bea1ece9f1aa0062347f3eb0ee
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Mar 12 16:36:32 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Mar 12 17:47:50 2020 +0100

    cypress: mobile: update shape related tests.
    
    Default client view was changed.
    
    Change-Id: Ie8506b133fba43bcddff238fc0cefc31911e3dee
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90426
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
index 84dfdae51..a9e9994c3 100644
--- a/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
+++ b/cypress_test/integration_tests/mobile/writer/shape_properties_spec.js
@@ -4,7 +4,7 @@ var helper = require('../../common/helper');
 var writerHelper = require('./writer_helper');
 
 describe('Change shape properties via mobile wizard.', function() {
-	var defaultGeometry = 'M 1965,4810 L 7957,10802 1965,10802 1965,4810 1965,4810 Z';
+	var defaultGeometry = 'M 1965,4863 L 7957,10855 1965,10855 1965,4863 1965,4863 Z';
 
 	beforeEach(function() {
 		helper.beforeAllMobile('shape_properties.odt', 'writer');
@@ -106,7 +106,7 @@ describe('Change shape properties via mobile wizard.', function() {
 			.should('have.attr', 'd', defaultGeometry);
 
 		cy.get('.leaflet-pane.leaflet-overlay-pane svg g svg g g g path')
-			.should('have.attr', 'd', 'M 1965,4810 L 12635,10802 1965,10802 1965,4810 1965,4810 Z');
+			.should('have.attr', 'd', 'M 1965,4863 L 12635,10855 1965,10855 1965,4863 1965,4863 Z');
 	});
 
 	it('Change shape height.', function() {
@@ -125,7 +125,7 @@ describe('Change shape properties via mobile wizard.', function() {
 			.should('not.have.attr', 'd', defaultGeometry);
 
 		cy.get('.leaflet-pane.leaflet-overlay-pane svg g svg g g g path')
-			.should('have.attr', 'd', 'M 1965,4810 L 7957,18020 1965,18020 1965,4810 1965,4810 Z');
+			.should('have.attr', 'd', 'M 1965,4863 L 7957,18073 1965,18073 1965,4863 1965,4863 Z');
 	});
 
 	it('Change size with keep ratio enabled.', function() {
@@ -152,7 +152,7 @@ describe('Change shape properties via mobile wizard.', function() {
 			.should('not.have.attr', 'd', defaultGeometry);
 
 		cy.get('.leaflet-pane.leaflet-overlay-pane svg g svg g g g path')
-			.should('have.attr', 'd', 'M 1965,4810 L 15175,18020 1965,18020 1965,4810 1965,4810 Z');
+			.should('have.attr', 'd', 'M 1965,4863 L 15175,18073 1965,18073 1965,4863 1965,4863 Z');
 	});
 
 	it('Vertical mirroring', function() {
@@ -165,7 +165,7 @@ describe('Change shape properties via mobile wizard.', function() {
 			.should('not.have.attr', 'd', defaultGeometry);
 
 		cy.get('.leaflet-pane.leaflet-overlay-pane svg g svg g g g path')
-			.should('have.attr', 'd', 'M 1965,10800 L 7957,4808 1965,4808 1965,10800 1965,10800 Z');
+			.should('have.attr', 'd', 'M 1965,10853 L 7957,4861 1965,4861 1965,10853 1965,10853 Z');
 	});
 
 	it('Horizontal mirroring', function() {
@@ -180,7 +180,7 @@ describe('Change shape properties via mobile wizard.', function() {
 			.should('not.have.attr', 'd', defaultGeometry);
 
 		cy.get('.leaflet-pane.leaflet-overlay-pane svg g svg g g g path')
-			.should('have.attr', 'd', 'M 8010,4810 L 1963,10802 8010,10802 8010,4810 8010,4810 Z');
+			.should('have.attr', 'd', 'M 8010,4863 L 1963,10855 8010,10855 8010,4863 8010,4863 Z');
 	});
 
 	it('Trigger moving backward / forward', function() {
commit 19a7f1d288f4ff57129078c339c09a78c0b2c2f4
Author:     Tamás Zolnai <tamas.zolnai at collabora.com>
AuthorDate: Thu Mar 12 16:59:14 2020 +0100
Commit:     Tamás Zolnai <tamas.zolnai at collabora.com>
CommitDate: Thu Mar 12 17:47:35 2020 +0100

    test: better fix for UnitWOPISaveAs test
    
    Don't check the full URL, but just test some parts of it.
    
    Change-Id: I5367bf4f41dc26f311e03de7ce06349f744d0b85
    Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90428
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>

diff --git a/test/UnitWOPISaveAs.cpp b/test/UnitWOPISaveAs.cpp
index 2831aa543..46f5a2309 100644
--- a/test/UnitWOPISaveAs.cpp
+++ b/test/UnitWOPISaveAs.cpp
@@ -45,20 +45,14 @@ public:
     {
         const std::string message(data, len);
 
-        const std::string expected(
-            "saveas: url=" + helpers::getTestServerURI()
-            + "/something%20wopi/files/1?access_token=anything&reuse_cookies=cook=well "
-              "filename=hello%20world%251.pdf xfilename=hello world%1.pdf");
-        if (message.find(expected) == 0)
+        if (message.find("saveas: url=") != std::string::npos &&
+            message.find(helpers::getTestServerURI()) != std::string::npos &&
+            message.find("filename=hello%20world%251.pdf") != std::string::npos)
         {
             // successfully exit the test if we also got the outgoing message
             // notifying about saving the file
             exitTest(TestResult::Ok);
         }
-        else
-        {
-            LOG_DBG("UnitWOPISaveAs: Skipping unexpected SendMessage: " << message);
-        }
 
         return false;
     }