You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by hn...@apache.org on 2017/05/05 09:40:39 UTC
svn commit: r1793993 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/
tobago-example/tobago-ex...
Author: hnoeth
Date: Fri May 5 09:40:39 2017
New Revision: 1793993
URL: http://svn.apache.org/viewvc?rev=1793993&view=rev
Log:
TOBAGO-1739 tc:out breaks the text flow
* labelLayout="skip" produce a SPAN instead of DIV
* adjust tests
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java?rev=1793993&r1=1793992&r2=1793993&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/LabelLayoutRendererBase.java Fri May 5 09:40:39 2017
@@ -137,7 +137,7 @@ public abstract class LabelLayoutRendere
}
// if (labelLayout != LabelLayout.none) {
- writer.startElement(HtmlElements.DIV);
+ writer.startElement(LabelLayout.skip == labelLayout ? HtmlElements.SPAN : HtmlElements.DIV);
writer.writeIdAttribute(clientId);
// }
// writer.writeClassAttribute(divClass, BootstrapClass.maximumSeverity(component));
@@ -207,7 +207,7 @@ public abstract class LabelLayoutRendere
}
// if (labelLayout != LabelLayout.none) {
- writer.endElement(HtmlElements.DIV);
+ writer.endElement(LabelLayout.skip == labelLayout ? HtmlElements.SPAN : HtmlElements.DIV);
// }
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js?rev=1793993&r1=1793992&r2=1793993&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/50-input-group/group.test.js Fri May 5 09:40:39 2017
@@ -23,7 +23,7 @@ QUnit.test("span(https://example.com/) -
var combinedWidth = $span.outerWidth(true) + $input.outerWidth(true);
assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width(),
+ assert.ok(combinedWidth <= $mainForm.width() + 1,
"Width of inputfield (" + $span.outerWidth(true) + "px) + span (" + $input.outerWidth(true) + "px) (="
+ combinedWidth + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
assert.equal($span.outerHeight(), $input.outerHeight());
@@ -38,7 +38,7 @@ QUnit.test("label(Price) - inputfield -
var combinedWidth = $label.outerWidth(true) + $span.outerWidth(true) + $input.outerWidth(true);
assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width(),
+ assert.ok(combinedWidth <= $mainForm.width() + 1,
"Width of label (" + $label.outerWidth(true) + "px) + input (" + $input.outerWidth(true) + "px) + span ("
+ $span.outerWidth(true) + "px) (=" + combinedWidth
+ "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
@@ -54,7 +54,7 @@ QUnit.test("span(User Two) - inputfield
var combinedWidth = $span.outerWidth(true) + $input.outerWidth(true) + $button.outerWidth(true);
assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width(),
+ assert.ok(combinedWidth <= $mainForm.width() + 1,
"Width of span (" + $span.outerWidth(true) + "px) + input (" + $input.outerWidth(true) + "px) + button ("
+ $button.outerWidth(true) + "px) (=" + combinedWidth
+ "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
@@ -70,7 +70,7 @@ QUnit.test("dropdown-button - inputfield
var combinedWidth = $button.outerWidth(true) + $input.outerWidth(true);
assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width(),
+ assert.ok(combinedWidth <= $mainForm.width() + 1,
"Width of button (" + $button.outerWidth(true) + "px) + input (" + $input.outerWidth(true) + "px) (="
+ combinedWidth + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
assert.equal($button.outerHeight(), $input.outerHeight());
@@ -85,7 +85,7 @@ QUnit.test("inputfield - span(Send To:)
var combinedWidth = $input.outerWidth(true) + $span.outerWidth(true) + $button.outerWidth(true);
assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width(),
+ assert.ok(combinedWidth <= $mainForm.width() + 1,
"Width of input (" + $input.outerWidth(true) + "px) + span (" + $span.outerWidth(true) + "px) + button ("
+ $button.outerWidth(true) + "px) (=" + combinedWidth
+ "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
@@ -101,7 +101,7 @@ QUnit.test("inputfield - dropdownbox", f
var combinedWidth = $input.outerWidth(true) + $dropdown.outerWidth(true);
assert.equal($inputfield.outerWidth(true), $mainForm.width());
- assert.ok(combinedWidth <= $mainForm.width(),
+ assert.ok(combinedWidth <= $mainForm.width() + 1,
"Width of input (" + $input.outerWidth(true) + "px) + dropdown (" + $dropdown.outerWidth(true) + "px) (="
+ combinedWidth + "px) must be smaller/equal than the width of the content box (" + $mainForm.width() + "px).");
assert.equal($input.outerHeight(), $dropdown.outerHeight());
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js?rev=1793993&r1=1793992&r2=1793993&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/080-sheet/10-sort/sheet-sorting.test.js Fri May 5 09:40:39 2017
@@ -210,46 +210,46 @@ QUnit.test("Basics: Year", function (ass
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
- return $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text() == "1789"
- && $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text() == "1848";
+ return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() == "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() == "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell span").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell span").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
- return $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text() == "1989"
- && $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text() == "1989"
- && $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text() == "1989"
- && $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text() == "1986";
+ return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() == "1989"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() == "1989"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() == "1989"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() == "1986";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell span").eq(2).text(), "1989", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell span").eq(2).text(), "1989", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell span").eq(2).text(), "1989", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell span").eq(2).text(), "1986", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1989", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1989", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1989", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1986", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
- return $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text() == "1789"
- && $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text() == "1848";
+ return $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() == "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() == "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell span").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell span").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
step++;
done();
});
@@ -802,48 +802,48 @@ QUnit.test("Custom Sorting: Year", funct
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
return step == 2
- && $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text() == "1789"
- && $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text() == "1848";
+ && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() == "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() == "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell span").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell span").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
return step == 3
- && $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text() == "1989"
- && $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text() == "1989"
- && $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text() == "1989"
- && $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text() == "1986";
+ && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() == "1989"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() == "1989"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() == "1989"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() == "1986";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell span").eq(2).text(), "1989", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell span").eq(2).text(), "1989", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell span").eq(2).text(), "1989", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell span").eq(2).text(), "1986", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1989", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1989", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1989", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1986", "row3col2");
$colYear.click();
waitForAjax(function () {
$rows = jQueryFrame($rows.selector);
return step == 4
- && $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text() == "1789"
- && $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text() == "1846"
- && $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text() == "1848";
+ && $rows.eq(0).find(".tobago-sheet-cell").eq(2).text() == "1789"
+ && $rows.eq(1).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(2).find(".tobago-sheet-cell").eq(2).text() == "1846"
+ && $rows.eq(3).find(".tobago-sheet-cell").eq(2).text() == "1848";
}, function () {
$rows = jQueryFrame($rows.selector);
- assert.equal($rows.eq(0).find(".tobago-sheet-cell span").eq(2).text(), "1789", "row0col2");
- assert.equal($rows.eq(1).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row1col2");
- assert.equal($rows.eq(2).find(".tobago-sheet-cell span").eq(2).text(), "1846", "row2col2");
- assert.equal($rows.eq(3).find(".tobago-sheet-cell span").eq(2).text(), "1848", "row3col2");
+ assert.equal($rows.eq(0).find(".tobago-sheet-cell").eq(2).text(), "1789", "row0col2");
+ assert.equal($rows.eq(1).find(".tobago-sheet-cell").eq(2).text(), "1846", "row1col2");
+ assert.equal($rows.eq(2).find(".tobago-sheet-cell").eq(2).text(), "1846", "row2col2");
+ assert.equal($rows.eq(3).find(".tobago-sheet-cell").eq(2).text(), "1848", "row3col2");
step++;
done();
});
@@ -1202,18 +1202,18 @@ QUnit.test("Custom Sorting: right paging
function ajaxWaitingBodyTableCheck($rows, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
row2col0, row2col1, row2col2, row3col0, row3col1, row3col2) {
- var $row0Col0 = $rows.eq(0).find(".tobago-sheet-cell span").eq(0).text();
- var $row0Col1 = $rows.eq(0).find(".tobago-sheet-cell span").eq(1).text();
- var $row0Col2 = $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text();
- var $row1Col0 = $rows.eq(1).find(".tobago-sheet-cell span").eq(0).text();
- var $row1Col1 = $rows.eq(1).find(".tobago-sheet-cell span").eq(1).text();
- var $row1Col2 = $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text();
- var $row2Col0 = $rows.eq(2).find(".tobago-sheet-cell span").eq(0).text();
- var $row2Col1 = $rows.eq(2).find(".tobago-sheet-cell span").eq(1).text();
- var $row2Col2 = $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text();
- var $row3Col0 = $rows.eq(3).find(".tobago-sheet-cell span").eq(0).text();
- var $row3Col1 = $rows.eq(3).find(".tobago-sheet-cell span").eq(1).text();
- var $row3Col2 = $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text();
+ var $row0Col0 = $rows.eq(0).find(".tobago-sheet-cell").eq(0).text();
+ var $row0Col1 = $rows.eq(0).find(".tobago-sheet-cell").eq(1).text();
+ var $row0Col2 = $rows.eq(0).find(".tobago-sheet-cell").eq(2).text();
+ var $row1Col0 = $rows.eq(1).find(".tobago-sheet-cell").eq(0).text();
+ var $row1Col1 = $rows.eq(1).find(".tobago-sheet-cell").eq(1).text();
+ var $row1Col2 = $rows.eq(1).find(".tobago-sheet-cell").eq(2).text();
+ var $row2Col0 = $rows.eq(2).find(".tobago-sheet-cell").eq(0).text();
+ var $row2Col1 = $rows.eq(2).find(".tobago-sheet-cell").eq(1).text();
+ var $row2Col2 = $rows.eq(2).find(".tobago-sheet-cell").eq(2).text();
+ var $row3Col0 = $rows.eq(3).find(".tobago-sheet-cell").eq(0).text();
+ var $row3Col1 = $rows.eq(3).find(".tobago-sheet-cell").eq(1).text();
+ var $row3Col2 = $rows.eq(3).find(".tobago-sheet-cell").eq(2).text();
return $row0Col0 == row0col0 && $row0Col1 == row0col1 && $row0Col2 == row0col2
&& $row1Col0 == row1col0 && $row1Col1 == row1col1 && $row1Col2 == row1col2
@@ -1223,18 +1223,18 @@ function ajaxWaitingBodyTableCheck($rows
function ajaxExecuteBodyTableCheck(assert, $rows, row0col0, row0col1, row0col2, row1col0, row1col1, row1col2,
row2col0, row2col1, row2col2, row3col0, row3col1, row3col2) {
- var $row0Col0 = $rows.eq(0).find(".tobago-sheet-cell span").eq(0).text();
- var $row0Col1 = $rows.eq(0).find(".tobago-sheet-cell span").eq(1).text();
- var $row0Col2 = $rows.eq(0).find(".tobago-sheet-cell span").eq(2).text();
- var $row1Col0 = $rows.eq(1).find(".tobago-sheet-cell span").eq(0).text();
- var $row1Col1 = $rows.eq(1).find(".tobago-sheet-cell span").eq(1).text();
- var $row1Col2 = $rows.eq(1).find(".tobago-sheet-cell span").eq(2).text();
- var $row2Col0 = $rows.eq(2).find(".tobago-sheet-cell span").eq(0).text();
- var $row2Col1 = $rows.eq(2).find(".tobago-sheet-cell span").eq(1).text();
- var $row2Col2 = $rows.eq(2).find(".tobago-sheet-cell span").eq(2).text();
- var $row3Col0 = $rows.eq(3).find(".tobago-sheet-cell span").eq(0).text();
- var $row3Col1 = $rows.eq(3).find(".tobago-sheet-cell span").eq(1).text();
- var $row3Col2 = $rows.eq(3).find(".tobago-sheet-cell span").eq(2).text();
+ var $row0Col0 = $rows.eq(0).find(".tobago-sheet-cell").eq(0).text();
+ var $row0Col1 = $rows.eq(0).find(".tobago-sheet-cell").eq(1).text();
+ var $row0Col2 = $rows.eq(0).find(".tobago-sheet-cell").eq(2).text();
+ var $row1Col0 = $rows.eq(1).find(".tobago-sheet-cell").eq(0).text();
+ var $row1Col1 = $rows.eq(1).find(".tobago-sheet-cell").eq(1).text();
+ var $row1Col2 = $rows.eq(1).find(".tobago-sheet-cell").eq(2).text();
+ var $row2Col0 = $rows.eq(2).find(".tobago-sheet-cell").eq(0).text();
+ var $row2Col1 = $rows.eq(2).find(".tobago-sheet-cell").eq(1).text();
+ var $row2Col2 = $rows.eq(2).find(".tobago-sheet-cell").eq(2).text();
+ var $row3Col0 = $rows.eq(3).find(".tobago-sheet-cell").eq(0).text();
+ var $row3Col1 = $rows.eq(3).find(".tobago-sheet-cell").eq(1).text();
+ var $row3Col2 = $rows.eq(3).find(".tobago-sheet-cell").eq(2).text();
assert.equal($row0Col0, row0col0, "row0col0");
assert.equal($row0Col1, row0col1, "row0col1");
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js?rev=1793993&r1=1793992&r2=1793993&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/40-test/6000-event/event.test.js Fri May 5 09:40:39 2017
@@ -184,7 +184,7 @@ function testEvent(assert, componentName
function activateComponent(componentName, eventName) {
jQueryFrame("#page\\:mainForm\\:componentTable .tobago-sheet-row").each(function () {
- if (jQuery(this).find("td").eq(0).find("span").text() === componentName) {
+ if (jQuery(this).find("td").eq(0).find(".tobago-out").text() === componentName) {
jQuery(this).find("button").each(function () {
var id = jQuery(this).attr("id");
if (id !== undefined && id.indexOf(eventName + "Behavior") >= 0) {