From 05fa0b94722b192d009811def191a0a8cc2dc0a5 Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Thu, 19 Oct 2017 19:28:33 +0200 Subject: [PATCH] no-jira: reenable the selenium test for the drawing interaction --- src/test/java/org/olat/selenium/ImsQTI21Test.java | 2 -- .../selenium/page/course/CourseEditorPageFragment.java | 3 +-- .../page/course/MemberListConfigurationPage.java | 1 + src/test/java/org/olat/selenium/page/qti/QTI21Page.java | 9 +++++++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/test/java/org/olat/selenium/ImsQTI21Test.java b/src/test/java/org/olat/selenium/ImsQTI21Test.java index eebb9121d02..5848685ecda 100644 --- a/src/test/java/org/olat/selenium/ImsQTI21Test.java +++ b/src/test/java/org/olat/selenium/ImsQTI21Test.java @@ -34,7 +34,6 @@ import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.spec.WebArchive; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.olat.ims.qti21.QTI21AssessmentResultsOptions; @@ -2380,7 +2379,6 @@ public class ImsQTI21Test { * @throws IOException * @throws URISyntaxException */ - @Ignore @Test @RunAsClient public void qti21EditorDrawing(@InitialPage LoginPage authorLoginPage, 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 87c4845a873..4cadcc02654 100644 --- a/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java +++ b/src/test/java/org/olat/selenium/page/course/CourseEditorPageFragment.java @@ -217,12 +217,11 @@ public class CourseEditorPageFragment { public CourseEditorPageFragment createNode(String nodeAlias) { OOGraphene.waitElement(createNodeButton, 5, browser); browser.findElement(createNodeButton).click(); - OOGraphene.waitModalDialog(browser); + By node = By.xpath("//div[@id='o_course_editor_choose_nodetype']//a[contains(@class,'o_sel_course_editor_node-" + nodeAlias + "')]"); if("lti".equals(nodeAlias)) { OOGraphene.clickAndWait(node, browser); - } else { browser.findElement(node).click(); OOGraphene.waitBusy(browser); diff --git a/src/test/java/org/olat/selenium/page/course/MemberListConfigurationPage.java b/src/test/java/org/olat/selenium/page/course/MemberListConfigurationPage.java index 8ba503f4558..f0f87e45baf 100644 --- a/src/test/java/org/olat/selenium/page/course/MemberListConfigurationPage.java +++ b/src/test/java/org/olat/selenium/page/course/MemberListConfigurationPage.java @@ -62,6 +62,7 @@ public class MemberListConfigurationPage { WebElement checkboxEl = browser.findElement(checkboxBy); WebElement labelEl = browser.findElement(labelBy); OOGraphene.check(labelEl, checkboxEl, visible); + OOGraphene.waitBusy(browser); return this; } diff --git a/src/test/java/org/olat/selenium/page/qti/QTI21Page.java b/src/test/java/org/olat/selenium/page/qti/QTI21Page.java index 076b9ed3250..8235653a8bb 100644 --- a/src/test/java/org/olat/selenium/page/qti/QTI21Page.java +++ b/src/test/java/org/olat/selenium/page/qti/QTI21Page.java @@ -231,17 +231,22 @@ public class QTI21Page { return this; } + /** + * Draw a line of the house. + * @return Itself + */ public QTI21Page answerDrawing() { - By drawingBy = By.className("drawingInteraction"); + By drawingBy = By.xpath("//div[contains(@class,'drawingInteraction')]//canvas[@id='tmp_canvas']"); WebElement drawingEl = browser.findElement(drawingBy); new Actions(browser) .moveToElement(drawingEl, 30, 30) .clickAndHold() - .moveByOffset(100, 200) + .moveByOffset(260, 100) .release() .build() .perform(); + OOGraphene.waitingALittleBit(); return this; } -- GitLab