From 31303b7c8abc50e14cb4b09fe32e84749ba9974f Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 25 Jul 2019 16:48:05 +0200
Subject: [PATCH] no-jira: fix contact test for Firefox
---
src/test/java/org/olat/selenium/PortfolioV2Test.java | 3 ---
.../java/org/olat/selenium/page/core/ContactPage.java | 11 ++++-------
.../olat/selenium/page/course/AssessmentToolPage.java | 5 +----
.../page/course/CourseEditorPageFragment.java | 6 +++---
.../org/olat/selenium/page/repository/ScormPage.java | 6 +++---
5 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/src/test/java/org/olat/selenium/PortfolioV2Test.java b/src/test/java/org/olat/selenium/PortfolioV2Test.java
index 6dafc706657..56d69930186 100644
--- a/src/test/java/org/olat/selenium/PortfolioV2Test.java
+++ b/src/test/java/org/olat/selenium/PortfolioV2Test.java
@@ -31,7 +31,6 @@ import org.jboss.arquillian.drone.api.annotation.Drone;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.junit.Assert;
-import org.junit.Assume;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.olat.selenium.page.LoginPage;
@@ -62,7 +61,6 @@ import org.olat.test.JunitTestHelper;
import org.olat.test.rest.UserRestClient;
import org.olat.user.restapi.UserVO;
import org.openqa.selenium.WebDriver;
-import org.openqa.selenium.firefox.FirefoxDriver;
import com.dumbster.smtp.SmtpMessage;
@@ -640,7 +638,6 @@ public class PortfolioV2Test extends Deployments {
@RunAsClient
public void binderAssessment(@Drone @User WebDriver reiBrowser)
throws IOException, URISyntaxException {
- Assume.assumeFalse(reiBrowser instanceof FirefoxDriver);
UserVO author = new UserRestClient(deploymentUrl).createAuthor();
UserVO rei = new UserRestClient(deploymentUrl).createRandomUser("rei");
diff --git a/src/test/java/org/olat/selenium/page/core/ContactPage.java b/src/test/java/org/olat/selenium/page/core/ContactPage.java
index d3e87f6e67e..be03b12295a 100644
--- a/src/test/java/org/olat/selenium/page/core/ContactPage.java
+++ b/src/test/java/org/olat/selenium/page/core/ContactPage.java
@@ -26,7 +26,6 @@ import org.olat.selenium.page.graphene.OOGraphene;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;
-import org.openqa.selenium.firefox.FirefoxDriver;
/**
*
@@ -54,10 +53,10 @@ public class ContactPage {
public ContactPage setContent(String subject, String body) {
By subjectBy = By.cssSelector("div.o_sel_contact_subject input[type='text']");
OOGraphene.waitElement(subjectBy, browser);
- browser.findElement(subjectBy).sendKeys(subject);
+ OOGraphene.waitTinymce(browser);
+ browser.findElement(subjectBy).sendKeys(subject);
String containerCssSelector = "div.o_sel_contact_body";
- OOGraphene.waitTinymce(browser);
OOGraphene.tinymce(body, containerCssSelector, browser);
return this;
}
@@ -65,13 +64,11 @@ public class ContactPage {
public ContactPage send() {
By buttonsBy = By.xpath("//div[contains(@class,'o_sel_contact_buttons')]");
OOGraphene.scrollTo(buttonsBy, browser);
- if(browser instanceof FirefoxDriver) {
- OOGraphene.waitingALittleLonger();
- }
+
By sendBy = By.cssSelector("fieldset.o_sel_contact_form button.btn-primary");
browser.findElement(sendBy).click();
By disabledBy = By.cssSelector("fieldset.o_sel_contact_form div.o_sel_contact_body div.o_disabled");
- OOGraphene.waitElementSlowly(disabledBy, 10, browser);
+ OOGraphene.waitElement(disabledBy, browser);
OOGraphene.moveTop(browser);
OOGraphene.waitAndCloseBlueMessageWindow(browser);
diff --git a/src/test/java/org/olat/selenium/page/course/AssessmentToolPage.java b/src/test/java/org/olat/selenium/page/course/AssessmentToolPage.java
index 5279b7b15f1..1626fc3374a 100644
--- a/src/test/java/org/olat/selenium/page/course/AssessmentToolPage.java
+++ b/src/test/java/org/olat/selenium/page/course/AssessmentToolPage.java
@@ -21,9 +21,7 @@ package org.olat.selenium.page.course;
import java.util.List;
-import org.apache.logging.log4j.Logger;
import org.junit.Assert;
-import org.olat.core.logging.Tracing;
import org.olat.selenium.page.graphene.OOGraphene;
import org.olat.user.restapi.UserVO;
import org.openqa.selenium.By;
@@ -37,8 +35,7 @@ import org.openqa.selenium.WebElement;
*
*/
public class AssessmentToolPage {
- private static final Logger log = Tracing.createLoggerFor(AssessmentToolPage.class);
-
+
private final WebDriver browser;
public AssessmentToolPage(WebDriver browser) {
diff --git a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
index 05a615b6572..12a30e22ba8 100644
--- a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java
@@ -73,13 +73,13 @@ public class CourseEditorPageFragment {
}
public static CourseEditorPageFragment getEditor(WebDriver browser) {
- OOGraphene.waitElement(editorBy, 5, browser);
+ OOGraphene.waitElement(editorBy, browser);
OOGraphene.closeBlueMessageWindow(browser);
return new CourseEditorPageFragment(browser);
}
public CourseEditorPageFragment assertOnEditor() {
- OOGraphene.waitElement(editorBy, 5, browser);
+ OOGraphene.waitElement(editorBy, browser);
List<WebElement> editorEls = browser.findElements(editorBy);
Assert.assertFalse(editorEls.isEmpty());
Assert.assertTrue(editorEls.get(0).isDisplayed());
@@ -88,7 +88,7 @@ public class CourseEditorPageFragment {
public CourseEditorPageFragment assertOnWarning() {
By warningBy = By.cssSelector("div.modal-dialog div.alert.alert-warning");
- OOGraphene.waitElement(warningBy, 2, browser);
+ OOGraphene.waitElement(warningBy, browser);
List<WebElement> warningEls = browser.findElements(warningBy);
Assert.assertFalse(warningEls.isEmpty());
OOGraphene.closeModalDialogWindow(browser);
diff --git a/src/test/java/org/olat/selenium/page/repository/ScormPage.java b/src/test/java/org/olat/selenium/page/repository/ScormPage.java
index 64cb9359929..91b2c25a4d6 100644
--- a/src/test/java/org/olat/selenium/page/repository/ScormPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/ScormPage.java
@@ -21,7 +21,6 @@ package org.olat.selenium.page.repository;
import java.util.List;
-import org.junit.Assert;
import org.olat.selenium.page.graphene.OOGraphene;
import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver;
@@ -43,12 +42,13 @@ public class ScormPage {
}
public static ScormPage getScormPage(WebDriver browser) {
- WebElement main = browser.findElement(By.id("o_main_wrapper"));
- Assert.assertTrue(main.isDisplayed());
+ By mainBy = By.id("o_main_wrapper");
+ OOGraphene.waitElement(mainBy, browser);
return new ScormPage(browser);
}
public ScormPage start() {
+ assertOnStart();
By startBy = By.cssSelector("button.o_sel_start_scorm");
browser.findElement(startBy).click();
OOGraphene.waitBusy(browser);
--
GitLab