From 7a4a6611ba7301c88b064084a4d8ca6be09b416e Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 19 Jun 2015 09:31:25 +0200
Subject: [PATCH] OO-991: update selenium tests for group task
---
.../page/course/GroupTaskConfigurationPage.java | 10 ++++++++--
.../org/olat/selenium/page/course/GroupTaskPage.java | 3 ++-
.../selenium/page/course/GroupTaskToCoachPage.java | 1 +
3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java b/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java
index 32dffba547b..5baaa29cb29 100644
--- a/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java
+++ b/src/test/java/org/olat/selenium/page/course/GroupTaskConfigurationPage.java
@@ -119,6 +119,7 @@ public class GroupTaskConfigurationPage {
By inputBy = By.cssSelector(".o_fileinput input[type='file']");
OOGraphene.uploadFile(inputBy, file, browser);
+ OOGraphene.waitBusy(browser);
//save
By saveBy = By.cssSelector(".o_sel_course_gta_upload_task_form button.btn-primary");
@@ -129,7 +130,9 @@ public class GroupTaskConfigurationPage {
public GroupTaskConfigurationPage saveTasks() {
By saveBy = By.cssSelector(".o_sel_course_gta_task_config_buttons button.btn-primary");
- browser.findElement(saveBy).click();
+ List<WebElement> saveEls = browser.findElements(saveBy);
+ Assert.assertEquals(1, saveEls.size());
+ saveEls.get(0).click();
OOGraphene.waitBusy(browser);
return this;
}
@@ -144,10 +147,13 @@ public class GroupTaskConfigurationPage {
By inputBy = By.cssSelector(".o_fileinput input[type='file']");
OOGraphene.uploadFile(inputBy, file, browser);
+ OOGraphene.waitBusy(browser);
//save
By saveBy = By.cssSelector(".o_sel_course_gta_upload_solution_form button.btn-primary");
- browser.findElement(saveBy).click();
+ List<WebElement> saveEls = browser.findElements(saveBy);
+ Assert.assertEquals(1, saveEls.size());
+ saveEls.get(0).click();
OOGraphene.waitBusy(browser);
return this;
}
diff --git a/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java b/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java
index bb99b87498a..6b0547cbcab 100644
--- a/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java
+++ b/src/test/java/org/olat/selenium/page/course/GroupTaskPage.java
@@ -57,7 +57,7 @@ public class GroupTaskPage {
}
public GroupTaskPage assertTask(String taskName) {
- By selectLinkBy = By.xpath("//div[@id='o_step_assignement_content']//h5[contains(text(),'" + taskName + "')]");
+ By selectLinkBy = By.xpath("//div[@id='o_step_assignement_content']//h5//span[contains(text(),'" + taskName + "')]");
List<WebElement> selectLinkEls = browser.findElements(selectLinkBy);
Assert.assertFalse(selectLinkEls.isEmpty());
return this;
@@ -94,6 +94,7 @@ public class GroupTaskPage {
By inputBy = By.cssSelector(".o_fileinput input[type='file']");
OOGraphene.uploadFile(inputBy, file, browser);
+ OOGraphene.waitBusy(browser);
By saveButtonBy = By.cssSelector(".o_sel_course_gta_upload_form button.btn-primary");
browser.findElement(saveButtonBy).click();
diff --git a/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java b/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java
index e73dc392253..6bcafb7a3b1 100644
--- a/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java
+++ b/src/test/java/org/olat/selenium/page/course/GroupTaskToCoachPage.java
@@ -117,6 +117,7 @@ public class GroupTaskToCoachPage {
By inputBy = By.cssSelector(".o_fileinput input[type='file']");
OOGraphene.uploadFile(inputBy, correctionFile, browser);
+ OOGraphene.waitBusy(browser);
By saveButtonBy = By.cssSelector(".o_sel_course_gta_upload_form button.btn-primary");
browser.findElement(saveButtonBy).click();
--
GitLab