From de3948b77db83bd9178cda5e911094d3fbc2f040 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 11 Oct 2018 11:43:20 +0200
Subject: [PATCH] OO-3668: fix selenium tests after changes in table
---
.../org/olat/core/gui/components/table/TableRenderer.java | 7 +++----
.../org/olat/selenium/page/taxonomy/TaxonomyTreePage.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
index 467014d24b1..b816a52ba47 100644
--- a/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/table/TableRenderer.java
@@ -208,15 +208,14 @@ public class TableRenderer extends DefaultComponentRenderer {
boolean ajaxEnabled, URLBuilder ubu) {
if (table.isMultiSelect() && !table.isMultiSelectAsDisabled()) {
target.append("<div class='o_table_checkall input-sm'>")
- .append("<label class='checkbox-inline'>")
.append("<a href='#' onclick=\"javascript:o_table_toggleCheck('").append(formName).append("', true)\">")
.append("<i class='o_icon o_icon-lg o_icon_check_on'> </i> ")
.append(translator.translate("checkall"))
- .append("</a></label>");
- target.append("<label class='checkbox-inline'><a href=\"#\" onclick=\"javascript:o_table_toggleCheck('").append(formName).append("', false)\">")
+ .append("</a>");
+ target.append("<a href=\"#\" onclick=\"javascript:o_table_toggleCheck('").append(formName).append("', false)\">")
.append("<i class='o_icon o_icon-lg o_icon_check_off'> </i> ")
.append(translator.translate("uncheckall"))
- .append("</a></label>")
+ .append("</a>")
.append("</div>");
}
diff --git a/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java b/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java
index c080def36f9..820b73159cc 100644
--- a/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java
+++ b/src/test/java/org/olat/selenium/page/taxonomy/TaxonomyTreePage.java
@@ -69,7 +69,7 @@ public class TaxonomyTreePage {
}
public TaxonomyLevelPage selectTaxonomyLevel(String identifier) {
- By selectBy = By.xpath("//div[contains(@class,'o_sel_taxonomy_levels_tree')]//table//tr[td[text()[contains(.,'" + identifier + "')]]]/td/a[contains(@href,'select')]");
+ By selectBy = By.xpath("//div[contains(@class,'o_sel_taxonomy_levels_tree')]//table//tr/td/a[contains(@href,'select')][text()[contains(.,'" + identifier + "')]]");
OOGraphene.waitElement(selectBy, browser);
browser.findElement(selectBy).click();
OOGraphene.waitBusy(browser);
--
GitLab