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

OO-2687: fix selenium tests

parent 33dfbdc5
No related branches found
No related tags found
No related merge requests found
...@@ -100,14 +100,14 @@ public class QTI21Page { ...@@ -100,14 +100,14 @@ public class QTI21Page {
} }
public QTI21Page answerSingleChoice(String answer) { public QTI21Page answerSingleChoice(String answer) {
By choiceBy = By.xpath("//tr[contains(@class,'choiceinteraction')][td[contains(@class,'choiceInteraction')][p[contains(normalize-space(text()),'" + answer + "')]]]/td[contains(@class,'control')]/input[@type='radio']"); By choiceBy = By.xpath("//tr[contains(@class,'choiceinteraction')][td[contains(@class,'choiceInteraction')][label/p[contains(normalize-space(text()),'" + answer + "')]]]/td[contains(@class,'control')]/input[@type='radio']");
browser.findElement(choiceBy).click(); browser.findElement(choiceBy).click();
return this; return this;
} }
public QTI21Page answerMultipleChoice(String... answers) { public QTI21Page answerMultipleChoice(String... answers) {
for(String answer:answers) { for(String answer:answers) {
By choiceBy = By.xpath("//tr[contains(@class,'choiceinteraction')][td[contains(@class,'choiceInteraction')][p[contains(text(),'" + answer + "')]]]/td[contains(@class,'control')]/input[@type='checkbox']"); By choiceBy = By.xpath("//tr[contains(@class,'choiceinteraction')][td[contains(@class,'choiceInteraction')][label/p[contains(text(),'" + answer + "')]]]/td[contains(@class,'control')]/input[@type='checkbox']");
browser.findElement(choiceBy).click(); browser.findElement(choiceBy).click();
} }
return this; return this;
...@@ -337,6 +337,7 @@ public class QTI21Page { ...@@ -337,6 +337,7 @@ public class QTI21Page {
} }
By optionsBy = By.cssSelector("ul.o_sel_course_settings a.o_sel_qti_resource_options"); By optionsBy = By.cssSelector("ul.o_sel_course_settings a.o_sel_qti_resource_options");
OOGraphene.waitElement(optionsBy, browser);
browser.findElement(optionsBy).click(); browser.findElement(optionsBy).click();
OOGraphene.waitBusy(browser); OOGraphene.waitBusy(browser);
return new QTI21OptionsPage(browser); return new QTI21OptionsPage(browser);
...@@ -373,6 +374,7 @@ public class QTI21Page { ...@@ -373,6 +374,7 @@ public class QTI21Page {
public QTI21Page openSettingsMenu() { public QTI21Page openSettingsMenu() {
By settingsMenuCaret = By.cssSelector("a.o_sel_course_settings"); By settingsMenuCaret = By.cssSelector("a.o_sel_course_settings");
OOGraphene.waitElement(settingsMenuCaret, browser);
browser.findElement(settingsMenuCaret).click(); browser.findElement(settingsMenuCaret).click();
OOGraphene.waitElement(settingsMenu, browser); OOGraphene.waitElement(settingsMenu, browser);
return this; return this;
......
...@@ -197,6 +197,7 @@ public class AuthoringEnvPage { ...@@ -197,6 +197,7 @@ public class AuthoringEnvPage {
if(saveButton.isEnabled()) { if(saveButton.isEnabled()) {
saveButton.click(); saveButton.click();
OOGraphene.waitBusy(browser); OOGraphene.waitBusy(browser);
OOGraphene.waitElement(RepositoryEditDescriptionPage.generaltabBy, browser);
} }
return this; return this;
} }
......
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