Index: /FCKtest/config.js =================================================================== --- /FCKtest/config.js (revision 1451) +++ /FCKtest/config.js (revision 1452) @@ -1,6 +1,6 @@ var FCKTestConfig = { - BasePath : "/fcktest", - EditorPath : "/fckeditor" + BasePath : "/FCKeditor/FCKtest", + EditorPath : "/FCKeditor/trunk" }; Index: /FCKtest/fckeditor/ts/visual/1355/1355.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355.html (revision 1452) @@ -0,0 +1,233 @@ + + + + Tests for #1355 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Tests for #1355
selectFrameid=FCKeditor1___Frame
fckLoadContents${CURRENTPATH}/1355/test_format_input1.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_pre' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input1_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input2.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_pre' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input2_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input3.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_pre' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input3_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input4.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_pre' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input4_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input5.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_pre' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input5_results.htmlattr,attr2
fckLoadContents${CURRENTPATH}/1355/test_format_input6.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_p' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input6_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input7.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_p' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input7_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input8.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_p' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input8_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input9.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_p' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input9_results.html
fckLoadContents${CURRENTPATH}/1355/test_format_input10.html
waitForCondition + win = selenium.browserbot.getCurrentWindow() ; + win.FCKStyles.GetStyle( '_FCK_p' ).ApplyToSelection( win.FCK.EditorWindow ); + true ; + 500
fckCheckSimilarTo${CURRENTPATH}/1355/test_format_input10_results.html
+ + + Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input1.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input1.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input1.html (revision 1452) @@ -0,0 +1,3 @@ +

Line 1
+Line 2
+Line 3

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input10.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input10.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input10.html (revision 1452) @@ -0,0 +1,6 @@ +
+    Some
+
+
+    sample
+
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input10_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input10_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input10_results.html (revision 1452) @@ -0,0 +1,6 @@ +

+    Some
+
+
+    sample +

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input1_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input1_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input1_results.html (revision 1452) @@ -0,0 +1,4 @@ +
+Line 1
+Line 2
+Line 3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input2.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input2.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input2.html (revision 1452) @@ -0,0 +1,22 @@ +

+ + +Line + + + + 1 + +
+ + + +Line + 2 + + + + +
+ Line 3 +

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input2_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input2_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input2_results.html (revision 1452) @@ -0,0 +1,4 @@ +
+Line 1
+Line 2
+Line 3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input3.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input3.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input3.html (revision 1452) @@ -0,0 +1,3 @@ +

  Line 1
+  Line 2
+Line   3

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input3_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input3_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input3_results.html (revision 1452) @@ -0,0 +1,4 @@ +
+  Line 1
+  Line 2
+Line   3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input4.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input4.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input4.html (revision 1452) @@ -0,0 +1,1 @@ +

Line 1
Line 2
Line 3

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input4_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input4_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input4_results.html (revision 1452) @@ -0,0 +1,4 @@ +
+Line 1
+Line 2
+Line 3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input5.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input5.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input5.html (revision 1452) @@ -0,0 +1,3 @@ +

Line 1
+Line 2
+Line 3

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input5_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input5_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input5_results.html (revision 1452) @@ -0,0 +1,4 @@ +
+Line 1
+Line 2
+Line 3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input6.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input6.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input6.html (revision 1452) @@ -0,0 +1,3 @@ +
Line 1
+Line 2
+Line 3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input6_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input6_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input6_results.html (revision 1452) @@ -0,0 +1,3 @@ +

Line 1
+Line 2
+Line 3

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input7.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input7.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input7.html (revision 1452) @@ -0,0 +1,3 @@ +
 Line   1
+Line  2
+Line   3
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input7_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input7_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input7_results.html (revision 1452) @@ -0,0 +1,3 @@ +

 Line   1
+Line  2
+Line   3

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input8.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input8.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input8.html (revision 1452) @@ -0,0 +1,5 @@ +
                               
+ Line   1
+Line  2
+Line   3 
+
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input8_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input8_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input8_results.html (revision 1452) @@ -0,0 +1,3 @@ +

 Line   1
+Line  2
+Line   3 

Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input9.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input9.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input9.html (revision 1452) @@ -0,0 +1,5 @@ +
                               
+ Line   1
+Line  2
+Line   3 
+
Index: /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input9_results.html =================================================================== --- /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input9_results.html (revision 1452) +++ /FCKtest/fckeditor/ts/visual/1355/1355/test_format_input9_results.html (revision 1452) @@ -0,0 +1,4 @@ +

 Line   1
+Line  2
+Line   3
+ 

Index: /FCKtest/runners/selenium/scripts/user-extensions.js =================================================================== --- /FCKtest/runners/selenium/scripts/user-extensions.js (revision 1451) +++ /FCKtest/runners/selenium/scripts/user-extensions.js (revision 1452) @@ -91,9 +91,13 @@ // I can't implement the following as an isXyz function in Selenium because it involves Ajax calls and thus timeouts -Selenium.prototype.doFckCheckSimilarTo = function( url ) +Selenium.prototype.doFckCheckSimilarTo = function( url, watchAttributes ) { var win = this.browserbot.getCurrentWindow() ; var editorBody = win.FCK.EditorDocument.body.cloneNode( true ) ; var verifyBody = document.createElement( 'body' ) ; + if ( watchAttributes && watchAttributes.length ) + watchAttributes = watchAttributes.split( ',' ) ; + else + watchAttributes = [] ; var waitFunc = function() { @@ -119,8 +123,21 @@ throw new SeleniumError( "DOM structure mismatch: missing DOM node in verification document - " + editorNode.nodeName + " expected." ) ; - if ( editorNode.nodeType == 1 && editorNode.nodeName != verifyNode.nodeName ) - throw new SeleniumError( "DOM structure mismatch: element tags are different - " - + editorNode.nodeName + " encountered in editor document while " - + verifyNode.nodeName + " is expected by verification document." ) ; + if ( editorNode.nodeType == 1 ) + { if ( editorNode.nodeName != verifyNode.nodeName ) + throw new SeleniumError( "DOM structure mismatch: element tags are different - " + + editorNode.nodeName + " encountered in editor document while " + + verifyNode.nodeName + " is expected by verification document." ) ; + for ( var i = 0 ; i < watchAttributes.length ; i++ ) + { + var attrName = watchAttributes[i] ; + if ( editorNode.getAttribute( attrName ) != verifyNode.getAttribute( attrName ) ) + throw new SeleniumError( "DOM structure mismatch: Element attribute \"" + attrName + + "\" is different - " + + attrName + "=" + editorNode.getAttribute( attrName ) + + " encountered in editor document while " + + attrName + "=" + verifyNode.getAttribute( attrName ) + + " is expected by verification document." ) ; + } + } if ( editorNode.nodeType == 3 && editorNode.nodeValue != verifyNode.nodeValue ) throw new SeleniumError( "DOM structure mismatch: text node values are different - " Index: /FCKtest/tests.js =================================================================== --- /FCKtest/tests.js (revision 1451) +++ /FCKtest/tests.js (revision 1452) @@ -56,5 +56,5 @@ "interactive" : [ - ["1514/test1.html", "#1514: Floating panel positioning"], + ["1514/test1.html", "#1514: Floating panel positioning"] ], "visual" : @@ -66,5 +66,6 @@ "testcase" : [ - ["loader.html", "Load FCKeditor"] + ["loader.html", "Load FCKeditor"], + ["1355/1355.html", "Tests for #1355"] ] }