From 0c134b02b8bc040e7ee42429d9b314e8942f0141 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 16 Jan 2020 11:23:19 +0100
Subject: [PATCH] no-jira: update selenium test for enrollment and learn path
---
src/test/java/org/olat/selenium/CourseTest.java | 2 +-
.../course/EnrollmentConfigurationPage.java | 17 +++++------------
.../page/repository/AuthoringEnvPage.java | 6 ++++++
3 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/src/test/java/org/olat/selenium/CourseTest.java b/src/test/java/org/olat/selenium/CourseTest.java
index 44073963487..5e5fdf3d243 100644
--- a/src/test/java/org/olat/selenium/CourseTest.java
+++ b/src/test/java/org/olat/selenium/CourseTest.java
@@ -258,7 +258,7 @@ public class CourseTest extends Deployments {
//open course editor
CoursePageFragment course = CoursePageFragment.getCourse(browser);
course
- .assertOnLearnPath()
+ .assertOnCoursePage()
.assertOnTitle(title);
//assert the 5 nodes are there and click them
diff --git a/src/test/java/org/olat/selenium/page/course/EnrollmentConfigurationPage.java b/src/test/java/org/olat/selenium/page/course/EnrollmentConfigurationPage.java
index 679427f26e5..c9396e3d6dd 100644
--- a/src/test/java/org/olat/selenium/page/course/EnrollmentConfigurationPage.java
+++ b/src/test/java/org/olat/selenium/page/course/EnrollmentConfigurationPage.java
@@ -51,7 +51,7 @@ public class EnrollmentConfigurationPage {
browser.findElement(createGroupBy).click();
OOGraphene.waitModalDialog(browser);
- By checkGroupsBy = By.cssSelector("div.modal-body input[type='checkbox'][name='entries']");
+ By checkGroupsBy = By.cssSelector("div.modal-body td.o_multiselect>input[type='checkbox'][name='tb_ms']");
List<WebElement> checkGroupEls = browser.findElements(checkGroupsBy);
for(WebElement checkGroupEl:checkGroupEls) {
checkGroupEl.click();
@@ -61,6 +61,7 @@ public class EnrollmentConfigurationPage {
By selectBy = By.cssSelector("div.modal-body div.o_button_group button.btn.btn-primary");
browser.findElement(selectBy).click();
OOGraphene.waitBusy(browser);
+ OOGraphene.waitModalDialogDisappears(browser);
return this;
}
@@ -70,12 +71,9 @@ public class EnrollmentConfigurationPage {
*/
public EnrollmentConfigurationPage createBusinessGroup(String name, String description,
int maxParticipants, boolean waitingList, boolean auto) {
- By chooseGroupBy = By.cssSelector("a.o_form_groupchooser");
+ By chooseGroupBy = By.cssSelector("a.o_form_groupcreate");
browser.findElement(chooseGroupBy).click();
OOGraphene.waitBusy(browser);
-
- By createGroupBy = By.cssSelector("div.o_button_group_right a");
- browser.findElement(createGroupBy).click();
OOGraphene.waitModalDialog(browser);
//fill the form
@@ -99,14 +97,9 @@ public class EnrollmentConfigurationPage {
//save the group
By submitBy = By.cssSelector(".o_sel_group_edit_group_form button.btn-primary");
- WebElement submitButton = browser.findElement(submitBy);
- submitButton.click();
- OOGraphene.waitBusy(browser);
- // save group selection
- By saveBy = By.cssSelector(".o_sel_group_selection_groups button.btn-primary");
- WebElement saveButton = browser.findElement(saveBy);
- saveButton.click();
+ browser.findElement(submitBy).click();
OOGraphene.waitBusy(browser);
+ OOGraphene.waitModalDialogDisappears(browser);
return this;
}
diff --git a/src/test/java/org/olat/selenium/page/repository/AuthoringEnvPage.java b/src/test/java/org/olat/selenium/page/repository/AuthoringEnvPage.java
index 0a0f0890e02..e605bd87b74 100644
--- a/src/test/java/org/olat/selenium/page/repository/AuthoringEnvPage.java
+++ b/src/test/java/org/olat/selenium/page/repository/AuthoringEnvPage.java
@@ -183,6 +183,12 @@ public class AuthoringEnvPage {
OOGraphene.waitModalDialog(browser);
By inputBy = By.cssSelector("div.modal.o_sel_author_create_popup div.o_sel_author_displayname input");
browser.findElement(inputBy).sendKeys(displayName);
+ // select node model for the course
+ By typeBy = By.cssSelector("#o_cocif_node_access_SELBOX>select");
+ WebElement typeEl = browser.findElement(typeBy);
+ new Select(typeEl).selectByValue("condition");
+ OOGraphene.waitBusy(browser);
+
By createBy = By.cssSelector("div.modal.o_sel_author_create_popup .o_sel_author_create_wizard");
browser.findElement(createBy).click();
OOGraphene.waitBusy(browser);
--
GitLab