diff --git a/src/test/java/org/olat/selenium/CourseElementTest.java b/src/test/java/org/olat/selenium/CourseElementTest.java
index d42735e9261a92992e8dcc3a42491b8691bbbc84..bfeafda0015929ca8352ac1e0a028c095405a5db 100644
--- a/src/test/java/org/olat/selenium/CourseElementTest.java
+++ b/src/test/java/org/olat/selenium/CourseElementTest.java
@@ -43,6 +43,7 @@ import org.olat.selenium.page.User;
import org.olat.selenium.page.core.ContactPage;
import org.olat.selenium.page.core.FolderPage;
import org.olat.selenium.page.core.MenuTreePageFragment;
+import org.olat.selenium.page.course.AssessmentToolPage;
import org.olat.selenium.page.course.BigBlueButtonPage;
import org.olat.selenium.page.course.CheckListConfigPage;
import org.olat.selenium.page.course.CheckListPage;
@@ -2042,7 +2043,7 @@ public class CourseElementTest extends Deployments {
.assertOnJoin();
}
-
+
/**
* An author create a course with a course element
* with one check box. It add one participant. The
@@ -2055,11 +2056,11 @@ public class CourseElementTest extends Deployments {
*/
@Test
@RunAsClient
- public void courseWithCheckboxWithScore()
+ public void courseWithCheckboxWithScore(@Drone @User WebDriver participantBrowser)
throws IOException, URISyntaxException {
UserVO author = new UserRestClient(deploymentUrl).createAuthor();
- UserVO participant = new UserRestClient(deploymentUrl).createRandomUser("ryomou");
+ UserVO participant = new UserRestClient(deploymentUrl).createRandomUser("nezuko");
LoginPage loginPage = LoginPage.load(browser, deploymentUrl);
loginPage.loginAs(author.getLogin(), author.getPassword());
@@ -2122,16 +2123,131 @@ public class CourseElementTest extends Deployments {
.save()
.clickToolbarBack();
+ // participant comes in
+
+ LoginPage participantLoginPage = LoginPage.load(participantBrowser, deploymentUrl);
+ participantLoginPage
+ .loginAs(participant.getLogin(), participant.getPassword());
+
+ NavigationPage participantNavBar = NavigationPage.load(participantBrowser);
+ participantNavBar
+ .openMyCourses()
+ .select(courseTitle);
+
+ CoursePageFragment course = new CoursePageFragment(participantBrowser);
+ course
+ .clickTree()
+ .selectWithTitle(nodeTitle);
+
+ CheckListPage checkPage = new CheckListPage(participantBrowser);
+ checkPage
+ .assertOnCheckbox(checkboxTitle)
+ .check(checkboxTitle);
+ // student has done the course
+ course
+ .assertOnLearnPathNodeDone(nodeTitle)
+ .assertOnLearnPathPercent(100);
+
+ // open the assessment tool and check the participant passed the node
+ // and the course
+ AssessmentToolPage assessmentTool = new CoursePageFragment(browser)
+ .assessmentTool();
+ assessmentTool
+ .users()
+ .assertOnUsers(participant)
+ .selectUser(participant)
+ .assertPassed(participant)
+ .assertUserPassedCourseNode(nodeTitle);
+ }
+
+ /**
+ * An author create a course with a course element
+ * with one check box. It add one participant and he
+ * checks the box.
+ *
+ * @param loginPage The login page
+ * @throws IOException
+ * @throws URISyntaxException
+ */
+ @Test
+ @RunAsClient
+ public void courseWithCheckbox()
+ throws IOException, URISyntaxException {
+
+ UserVO author = new UserRestClient(deploymentUrl).createAuthor();
+ UserVO participant = new UserRestClient(deploymentUrl).createRandomUser("nezuko");
+
+ LoginPage loginPage = LoginPage.load(browser, deploymentUrl);
+ loginPage.loginAs(author.getLogin(), author.getPassword());
+
+ //create a course
+ String courseTitle = "Checklist" + UUID.randomUUID();
+ NavigationPage navBar = NavigationPage.load(browser);
+ CoursePageFragment courseRuntime = navBar
+ .openAuthoringEnvironment()
+ .createCourse(courseTitle, true)
+ .clickToolbarBack();
+
+ //add participant
+ MembersPage members = courseRuntime
+ .members();
+ members
+ .importMembers()
+ .setMembers(participant)
+ .nextUsers()
+ .nextOverview()
+ .selectRepositoryEntryRole(false, false, true)
+ .nextPermissions()
+ .finish();
+ // back to course
+ members
+ .clickToolbarBack();
+
+ //create a course element of type Test with the test that we create above
+ String nodeTitle = "Liste de controle";
+ CourseEditorPageFragment courseEditor = CoursePageFragment.getCourse(browser)
+ .edit();
+ courseEditor
+ .createNode("checklist")
+ .nodeTitle(nodeTitle);
+
+ String checkboxTitle = "Do some stuff";
+
+ CheckListConfigPage checkConfig = new CheckListConfigPage(browser);
+ checkConfig
+ .selectListConfiguration()
+ .addCheckbox(checkboxTitle, -1)
+ .assertOnCheckboxInList(checkboxTitle);
+
+ checkConfig
+ .selectAssessmentConfiguration()
+ .disableScoring()
+ .saveAssessmentConfiguration();
+
+ courseEditor
+ .selectTabLearnPath()
+ .setCompletionCriterion(FullyAssessedTrigger.confirmed)
+ .save();
+
+ courseEditor
+ .autoPublish()
+ .publish()
+ .settings()
+ .accessConfiguration()
+ .setUserAccess(UserAccess.membersOnly)
+ .save()
+ .clickToolbarBack();
//log out
new UserToolsPage(browser)
.logout();
// participant comes in
- loginPage.loginAs(participant.getLogin(), participant.getPassword());
+ LoginPage.load(browser, deploymentUrl)
+ .loginAs(participant.getLogin(), participant.getPassword());
- NavigationPage ryomouNavBar = NavigationPage.load(browser);
- ryomouNavBar
+ NavigationPage participantNavBar = NavigationPage.load(browser);
+ participantNavBar
.openMyCourses()
.select(courseTitle);
@@ -2144,8 +2260,13 @@ public class CourseElementTest extends Deployments {
checkPage
.assertOnCheckbox(checkboxTitle)
.check(checkboxTitle);
+ // check doesn't influence the learn path
+ course
+ .assertOnLearnPathNodeReady(nodeTitle)
+ .assertOnLearnPathPercent(0);
// student has done the course
course
+ .confirmNode()
.assertOnLearnPathNodeDone(nodeTitle)
.assertOnLearnPathPercent(100);
}
diff --git a/src/test/java/org/olat/selenium/page/course/CheckListConfigPage.java b/src/test/java/org/olat/selenium/page/course/CheckListConfigPage.java
index 123134fd2f63f8e2724419b796525af7fa1ff19c..3c6fe19758d62fbeae7f4788e128c78bfd768f25 100644
--- a/src/test/java/org/olat/selenium/page/course/CheckListConfigPage.java
+++ b/src/test/java/org/olat/selenium/page/course/CheckListConfigPage.java
@@ -44,6 +44,13 @@ public class CheckListConfigPage {
return this;
}
+ /**
+ * Create a new check box with an optional score.
+ *
+ * @param title the name of the checkbox
+ * @param score The score or -1 if no score desired
+ * @return Itself
+ */
public CheckListConfigPage addCheckbox(String title, int score) {
By addCheckboxBy = By.className("o_sel_cl_new_checkbox");
OOGraphene.waitElement(addCheckboxBy, browser);
@@ -72,18 +79,55 @@ public class CheckListConfigPage {
return this;
}
+ /**
+ * Assert that the checkbox is in the edit list.
+ *
+ * @param title The name of the check box
+ * @return Itself
+ */
public CheckListConfigPage assertOnCheckboxInList(String title) {
By checkboxBy = By.xpath("//fieldset[contains(@class,'o_sel_cl_edit_checklist')]//div[contains(@class,'o_table_flexi')]/table//td[contains(text(),'" + title + "')]");
OOGraphene.waitElement(checkboxBy, browser);
return this;
}
+ /**
+ * Select the tab to edit the assessment configuration.
+ *
+ * @return Itself
+ */
public CheckListConfigPage selectAssessmentConfiguration() {
By configBy = By.className("o_sel_cl_edit_assessment");
OOGraphene.selectTab("o_node_config", configBy, browser);
return this;
}
+ /**
+ * Disable the summing of points and the rule to
+ * calculate passed with the cut value.
+ *
+ * @return Itself
+ */
+ public CheckListConfigPage disableScoring() {
+ By sumPointsBy = By.xpath("//fieldset[contains(@class,'o_sel_cl_edit_assessment')]//input[@name='points'][@value='on']");
+ OOGraphene.check(browser.findElement(sumPointsBy), Boolean.FALSE);
+ OOGraphene.waitBusy(browser);
+
+ By passedBy = By.xpath("//fieldset[contains(@class,'o_sel_cl_edit_assessment')]//input[@name='passed'][@value='on']");
+ OOGraphene.check(browser.findElement(passedBy), Boolean.FALSE);
+ OOGraphene.waitBusy(browser);
+
+ return this;
+ }
+
+ /**
+ * Set the minimal assessment configuration.
+ *
+ * @param minScore The minimum number of points
+ * @param maxScore The maximum number of points
+ * @param cutValue The number of points to pass
+ * @return Itself
+ */
public CheckListConfigPage setScoring(int minScore, int maxScore, int cutValue) {
By minScoreBy = By.cssSelector("fieldset.o_sel_cl_edit_assessment input.o_sel_cl_min_score[type='text']");
OOGraphene.waitElement(minScoreBy, browser);
diff --git a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
index f696bb962562d5441ed369198096f889adf13b9b..14fe8d48296a42453b3341edb2df7252092e7d05 100644
--- a/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
+++ b/src/test/java/org/olat/selenium/page/course/CoursePageFragment.java
@@ -169,8 +169,9 @@ public class CoursePageFragment {
}
/**
- * Click the first element of the menu tree
- * @return
+ * Click the first element of the menu tree.
+ *
+ * @return Itself
*/
public MenuTreePageFragment clickTree() {
OOGraphene.waitElement(MenuTreePageFragment.treeBy, browser);
@@ -179,8 +180,9 @@ public class CoursePageFragment {
}
/**
+ * Confirm you have done the course element.
*
- * @return
+ * @return Itself
*/
public CoursePageFragment confirmNode() {
By confirmationBy = By.cssSelector("div.o_course_pagination div.o_confirm a.btn");
@@ -194,8 +196,9 @@ public class CoursePageFragment {
}
/**
- * Open the tools drop-down
- * @return
+ * Open the tools drop-down.
+ *
+ * @return IUtself
*/
public CoursePageFragment openToolsMenu() {
browser.findElement(toolsMenuCaret).click();