Changeset 1452 for FCKtest/runners

Timestamp:

2008-01-30 08:06:19 (7 months ago)

Author:

martinkou

Message:

Added regression test casse for #1355.
Fixed JavaScript error when loading regression tests in IE.
Added the ability to check for attribute values when verifying HTML outputs in Selenium engine.

Files:

• FCKtest/runners/selenium/scripts/user-extensions.js (modified) (2 diffs)

FCKtest/runners/selenium/scripts/user-extensions.js

@@ -91 +91 @@
 
 // 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 +123 @@
                                 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 - "