Skip to content
Snippets Groups Projects
Commit d77706e3 authored by srosse's avatar srosse
Browse files

OO-1740: fix selenium tests

parent cd40bcdc
No related branches found
No related tags found
No related merge requests found
...@@ -22,7 +22,6 @@ package org.olat.selenium.page.course; ...@@ -22,7 +22,6 @@ package org.olat.selenium.page.course;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import org.jboss.arquillian.drone.api.annotation.Drone;
import org.junit.Assert; import org.junit.Assert;
import org.olat.selenium.page.graphene.OOGraphene; import org.olat.selenium.page.graphene.OOGraphene;
import org.olat.user.restapi.UserVO; import org.olat.user.restapi.UserVO;
...@@ -40,13 +39,8 @@ import org.openqa.selenium.WebElement; ...@@ -40,13 +39,8 @@ import org.openqa.selenium.WebElement;
*/ */
public class GroupTaskToCoachPage { public class GroupTaskToCoachPage {
@Drone
private WebDriver browser; private WebDriver browser;
public GroupTaskToCoachPage() {
//
}
public GroupTaskToCoachPage(WebDriver browser) { public GroupTaskToCoachPage(WebDriver browser) {
this.browser = browser; this.browser = browser;
} }
...@@ -134,7 +128,16 @@ public class GroupTaskToCoachPage { ...@@ -134,7 +128,16 @@ public class GroupTaskToCoachPage {
public GroupTaskToCoachPage openIndividualAssessment() { public GroupTaskToCoachPage openIndividualAssessment() {
By assessmentButtonBy = By.cssSelector("#o_step_grading_content .o_sel_course_gta_assessment_button"); By assessmentButtonBy = By.cssSelector("#o_step_grading_content .o_sel_course_gta_assessment_button");
browser.findElement(assessmentButtonBy).click(); List<WebElement> buttons = browser.findElements(assessmentButtonBy);
if(buttons.isEmpty() || !buttons.get(0).isDisplayed()) {
//open grading tab
By collpaseBy = By.xpath("//a[@href='#o_step_grading_content']");
browser.findElement(collpaseBy).click();
OOGraphene.waitElement(assessmentButtonBy, browser);
browser.findElement(assessmentButtonBy).click();
} else {
buttons.get(0).click();
}
OOGraphene.waitBusy(browser); OOGraphene.waitBusy(browser);
return this; return this;
} }
...@@ -158,7 +161,16 @@ public class GroupTaskToCoachPage { ...@@ -158,7 +161,16 @@ public class GroupTaskToCoachPage {
public GroupTaskToCoachPage openGroupAssessment() { public GroupTaskToCoachPage openGroupAssessment() {
By assessmentButtonBy = By.cssSelector("#o_step_grading_content .o_sel_course_gta_assessment_button"); By assessmentButtonBy = By.cssSelector("#o_step_grading_content .o_sel_course_gta_assessment_button");
browser.findElement(assessmentButtonBy).click(); List<WebElement> buttons = browser.findElements(assessmentButtonBy);
if(buttons.isEmpty() || !buttons.get(0).isDisplayed()) {
//open grading tab
By collpaseBy = By.xpath("//a[@href='#o_step_grading_content']");
browser.findElement(collpaseBy).click();
OOGraphene.waitElement(assessmentButtonBy, browser);
browser.findElement(assessmentButtonBy).click();
} else {
buttons.get(0).click();
}
OOGraphene.waitBusy(browser); OOGraphene.waitBusy(browser);
return this; return this;
} }
......
...@@ -136,6 +136,10 @@ public class OOGraphene { ...@@ -136,6 +136,10 @@ public class OOGraphene {
return Locale.ENGLISH; return Locale.ENGLISH;
} }
/**
* Wait the end of the transition of the user's tools bar.
* @param browser
*/
public static final void waitingTransition(WebDriver browser) { public static final void waitingTransition(WebDriver browser) {
Graphene.waitModel(browser).pollingEvery(poolingDuration, TimeUnit.MILLISECONDS).until(new TransitionPredicate()); Graphene.waitModel(browser).pollingEvery(poolingDuration, TimeUnit.MILLISECONDS).until(new TransitionPredicate());
waitingALittleBit(); waitingALittleBit();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment