From d2894081dd2114e1fd0275d0174181946ef5e9b6 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Sun, 28 Jun 2020 18:57:47 +0200
Subject: [PATCH] OO-2036: take screenshot to debug redirection issue in
selenium test
---
.../java/org/olat/dispatcher/AuthenticatedDispatcher.java | 5 +++--
.../java/org/olat/selenium/page/user/UserProfilePage.java | 7 ++++++-
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/dispatcher/AuthenticatedDispatcher.java b/src/main/java/org/olat/dispatcher/AuthenticatedDispatcher.java
index ba8f3dfe805..f90778dfd0b 100644
--- a/src/main/java/org/olat/dispatcher/AuthenticatedDispatcher.java
+++ b/src/main/java/org/olat/dispatcher/AuthenticatedDispatcher.java
@@ -262,8 +262,9 @@ public class AuthenticatedDispatcher implements Dispatcher {
ws.disposeClosedWindows(ureq);
Window window = ws.getWindow(ureq);
if (window == null) {
- //probably a
- if(usess.isSavedSession() && !usess.getHistoryStack().isEmpty()) {
+ if(request.getPathInfo() != null && request.getPathInfo().contains("close-window")) {
+ DispatcherModule.setNotContent(request.getPathInfo(), response);
+ } else if(usess.isSavedSession() && !usess.getHistoryStack().isEmpty()) {
redirectToDefaultDispatcher(request, response);
} else {
DispatcherModule.sendNotFound(request.getRequestURI(), response);
diff --git a/src/test/java/org/olat/selenium/page/user/UserProfilePage.java b/src/test/java/org/olat/selenium/page/user/UserProfilePage.java
index d40714a8a1a..b2f31b4059f 100644
--- a/src/test/java/org/olat/selenium/page/user/UserProfilePage.java
+++ b/src/test/java/org/olat/selenium/page/user/UserProfilePage.java
@@ -46,7 +46,12 @@ public class UserProfilePage {
*/
public UserProfilePage assertOnProfile() {
By profileSegmentBy = By.cssSelector("div.o_segments a.btn.o_sel_usersettings_profile");
- OOGraphene.waitElement(profileSegmentBy, 5, browser);
+ try {
+ OOGraphene.waitElement(profileSegmentBy, browser);
+ } catch (Exception e) {
+ OOGraphene.takeScreenshot("Assertonprofile", browser);
+ throw e;
+ }
WebElement profileSegmentEl = browser.findElement(profileSegmentBy);
Assert.assertTrue(profileSegmentEl.isDisplayed());
return this;
--
GitLab