From 1a94e74df0c05c16b90af0c136c9295c58e985ae Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 7 Feb 2018 16:33:34 +0100
Subject: [PATCH] OO-3179: fix selenium tests
---
src/main/resources/database/mysql/setupDatabase.sql | 2 +-
.../olat/selenium/page/portfolio/BinderPage.java | 5 +++--
.../org/olat/selenium/page/portfolio/EntryPage.java | 13 +++++++++----
3 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/database/mysql/setupDatabase.sql b/src/main/resources/database/mysql/setupDatabase.sql
index 90f5fcc7c15..42a72e51dea 100644
--- a/src/main/resources/database/mysql/setupDatabase.sql
+++ b/src/main/resources/database/mysql/setupDatabase.sql
@@ -1851,7 +1851,7 @@ create table o_eva_form_response (
e_responseidentifier varchar(64) not null,
e_numericalresponse decimal default null,
e_stringuifiedresponse mediumtext,
- e_file_response_path varchar(4000);
+ e_file_response_path varchar(4000),
fk_session bigint not null,
primary key (id)
);
diff --git a/src/test/java/org/olat/selenium/page/portfolio/BinderPage.java b/src/test/java/org/olat/selenium/page/portfolio/BinderPage.java
index 048900cfc9d..d097767a5dd 100644
--- a/src/test/java/org/olat/selenium/page/portfolio/BinderPage.java
+++ b/src/test/java/org/olat/selenium/page/portfolio/BinderPage.java
@@ -305,8 +305,9 @@ public class BinderPage {
}
public EntryPage pickAssignment(String assignmentTitle) {
- By assignmentButton = By.xpath("//div[contains(@class,'o_assignment_2_instantiate ')]/a[span[contains(text(),'" + assignmentTitle + "')]]");
- browser.findElement(assignmentButton).click();
+ By assignmentSelectBy = By.xpath("//div[contains(@class,'o_section_lead')]//select[contains(@id,'o_fioassignments')]");
+ OOGraphene.waitElement(assignmentSelectBy, browser);
+ new Select(browser.findElement(assignmentSelectBy)).selectByVisibleText(assignmentTitle);
OOGraphene.waitBusy(browser);
assertOnPage(assignmentTitle);
return new EntryPage(browser);
diff --git a/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java b/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java
index ef85ea2342e..d3032e7f63f 100644
--- a/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java
+++ b/src/test/java/org/olat/selenium/page/portfolio/EntryPage.java
@@ -103,8 +103,13 @@ public class EntryPage {
public EntryPage assertOnImage(File image) {
String filename = image.getName();
- By titleBy = By.xpath("//figure[contains(@class,'o_image')]//img[contains(@src,'" + filename + "')]");
- OOGraphene.waitElement(titleBy, 5, browser);
+ int typePos = filename.lastIndexOf('.');
+ if (typePos > 0) {
+ String ending = filename.substring(typePos + 1).toLowerCase();
+ filename = filename.substring(0, typePos + 1).concat(ending);
+ }
+ By titleBy = By.xpath("//figure[@class='o_image']/img[contains(@src,'" + filename + "')]");
+ OOGraphene.waitElement(titleBy, browser);
return this;
}
@@ -127,8 +132,8 @@ public class EntryPage {
return this;
}
- public EntryPage assertOnDocument(File image) {
- String filename = image.getName();
+ public EntryPage assertOnDocument(File file) {
+ String filename = file.getName();
By downloadLinkBy = By.xpath("//div[contains(@class,'o_download')]//a[contains(text(),'" + filename + "')]");
OOGraphene.waitElement(downloadLinkBy, 5, browser);
return this;
--
GitLab