From f2ec6c52e0b3df6e9bc5f419a67d59efb2818b71 Mon Sep 17 00:00:00 2001 From: lskublik Date: Tue, 24 Mar 2020 14:06:38 +0100 Subject: [PATCH 1/3] removing last slash in request url (MID-5139) --- .../evolveum/midpoint/web/util/ExactMatchMountedMapper.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java index b8a590a9d2c..0161eda38f0 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/util/ExactMatchMountedMapper.java @@ -16,6 +16,8 @@ import org.apache.wicket.request.mapper.parameter.IPageParametersEncoder; import org.apache.wicket.request.mapper.parameter.PageParametersEncoder; +import java.util.List; + /** * Created by lazyman on 09/03/2017. */ @@ -41,6 +43,10 @@ protected boolean urlStartsWithMountedSegments(Url url) { if (url == null) { return false; } + int segmentsSize = url.getSegments().size(); + if (segmentsSize != 0 && StringUtils.isBlank(url.getSegments().get(segmentsSize-1))) { + url.getSegments().remove(segmentsSize-1); + } if (!(pageParametersEncoder instanceof PageParametersEncoder)) { LOG.trace("Matching using standard mounted mapper for '{}'", url); From 561b51b4a5eb1de9a3ac5a0ea5afcaddace6df15 Mon Sep 17 00:00:00 2001 From: lskublik Date: Tue, 24 Mar 2020 17:59:38 +0100 Subject: [PATCH 2/3] adding prism object to reference - fix for getting activation of object (MID-6128) --- .../assignment/AssignmentEditorDto.java | 1 + .../schrodinger/page/HomePageTest.java | 25 +++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java index b307b33b18c..8b7e7097db2 100644 --- a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java +++ b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/component/assignment/AssignmentEditorDto.java @@ -192,6 +192,7 @@ public static AssignmentEditorDto createDtoFromObject(ObjectType object, UserDto if (relation != null){ targetRef.setRelation(relation); } + targetRef.asReferenceValue().setObject(object.asPrismObject()); AssignmentType assignment = new AssignmentType(); assignment.setTargetRef(targetRef); diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java new file mode 100644 index 00000000000..7a75ec19bf6 --- /dev/null +++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java @@ -0,0 +1,25 @@ +/* + * Copyright (c) 2010-2019 Evolveum and contributors + * + * This work is dual-licensed under the Apache License 2.0 + * and European Union Public License. See LICENSE file for details. + */ +package com.evolveum.midpoint.testing.schrodinger.page; + +import com.evolveum.midpoint.testing.schrodinger.AbstractSchrodingerTest; + +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * @author skublik + */ + +public class HomePage extends AbstractSchrodingerTest { + + @Test + public void test001OpenPageWithSlashOnEndOfUrl() { + Assert.assertFalse( + aboutPage.gitDescribe().isEmpty()); + } +} From 25794fb6f43003c40fb2446b1bb5ede5ef91c37e Mon Sep 17 00:00:00 2001 From: lskublik Date: Tue, 24 Mar 2020 18:01:30 +0100 Subject: [PATCH 3/3] adding of schrodinger tests for redirect to url with slash on end (MID-5139) --- .../schrodinger/page/HomePageTest.java | 20 +++++++++++++++---- .../schrodingertest/testng-integration.xml | 5 +++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java index 7a75ec19bf6..1bd949a47ab 100644 --- a/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java +++ b/testing/schrodingertest/src/test/java/com/evolveum/midpoint/testing/schrodinger/page/HomePageTest.java @@ -1,25 +1,37 @@ /* - * Copyright (c) 2010-2019 Evolveum and contributors + * Copyright (c) 2010-2020 Evolveum and contributors * * This work is dual-licensed under the Apache License 2.0 * and European Union Public License. See LICENSE file for details. */ package com.evolveum.midpoint.testing.schrodinger.page; +import com.evolveum.midpoint.schrodinger.component.common.FeedbackBox; +import com.evolveum.midpoint.schrodinger.page.login.FormLoginPage; import com.evolveum.midpoint.testing.schrodinger.AbstractSchrodingerTest; import org.testng.Assert; import org.testng.annotations.Test; +import static com.codeborne.selenide.Selenide.open; + /** * @author skublik */ -public class HomePage extends AbstractSchrodingerTest { +public class HomePageTest extends AbstractSchrodingerTest { @Test public void test001OpenPageWithSlashOnEndOfUrl() { - Assert.assertFalse( - aboutPage.gitDescribe().isEmpty()); + open("/self/dashboard/"); + //when request will be redirect to error page, then couldn't click on home menu button + basicPage.home(); + } + + @Test + public void test002OpenPageWithoutSlashOnEndOfUrl() { + open("/self/dashboard"); + //when request will be redirect to error page, then couldn't click on home menu button + basicPage.home(); } } diff --git a/testing/schrodingertest/testng-integration.xml b/testing/schrodingertest/testng-integration.xml index 28e4c92f5b9..528cb4721ec 100644 --- a/testing/schrodingertest/testng-integration.xml +++ b/testing/schrodingertest/testng-integration.xml @@ -98,4 +98,9 @@ + + + + + \ No newline at end of file