Index: Editor/tests/tt/4067/1.html
===================================================================
--- /CKEditor/tests/tt/4067/1.html (revision 4534)
+++ (revision )
@@ -1,62 +1,0 @@
-
-
-
- Test #4067 - HtmlParser
-
-
-
-
-
-
-
-
-
Index: /CKEditor/tests/tt/4067/2.html
===================================================================
--- /CKEditor/tests/tt/4067/2.html (revision 4534)
+++ /CKEditor/tests/tt/4067/2.html (revision 4535)
@@ -13,5 +13,5 @@
{
return CKEDITOR.test.fixHtml( CKEDITOR.document.getById( id ).getValue(), true, false )
- .replace( /\s*cke_docType=".*?"/g, '' );
+ .replace( /\s*cke_doctype=".*?"/g, '' );
}
@@ -19,5 +19,5 @@
{
return CKEDITOR.test.fixHtml( str, true, false )
- .replace( /\s*cke_docType=".*?"/g, '' );
+ .replace( /\s*cke_doctype=".*?"/g, '' );
}
@@ -46,4 +46,5 @@
ts1.add( tc1 = new YAHOO.tool.TestCase(
{
+// shouldIgnoreAllBut : [ 'test_htmldataprocessor_toDataFormat_fullpag' ],
/**
* Test "toHtml", when input is a complete document just missing docType.
@@ -61,5 +62,6 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, dataprocessor.toHtml( input, false, true ) );
+ var retval = dataprocessor.toFullPageHtml( input, false, true );
+ assert.areEqual( output, retval );
},
@@ -79,5 +81,5 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, dataprocessor.toHtml( input, false, true ) );
+ assert.areEqual( output, dataprocessor.toFullPageHtml( input, false, true ) );
},
@@ -97,5 +99,5 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, dataprocessor.toHtml( input, false, true ) );
+ assert.areEqual( output, dataprocessor.toFullPageHtml( input, false, true ) );
},
@@ -115,5 +117,5 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, dataprocessor.toHtml( input, false, true ) );
+ assert.areEqual( output, dataprocessor.toFullPageHtml( input, false, true ) );
},
@@ -133,5 +135,5 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, dataprocessor.toHtml( input, false, true ) );
+ assert.areEqual( output, dataprocessor.toFullPageHtml( input, false, true ) );
},
@@ -150,16 +152,4 @@
},
- /**
- * Test 'toDataFormat' when 'config.fullPage' is turned off.
- */
- test_htmldataprocessor_toDataFormat_fullpage_off : function()
- {
- var editor = ts1.editor,
- dataprocessor = editor.dataProcessor,
- input = getFixedContent( 'html-fullpage-xhtml' ),
- output = getFixedContent( 'html-missing-body' );
-
- assert.areEqual( output, dataprocessor.toDataFormat( input ) );
- },
name : document.title + '1'
} ) );
@@ -167,4 +157,5 @@
ts2.add( tc2 = new YAHOO.tool.TestCase(
{
+// shouldIgnoreAllBut : [ 'test_htmldataprocessor_toDataFormat_fullpage_on' ],
/**
* Test "toHtml" with 'config.docType' explicitly defined.
@@ -182,5 +173,5 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, getFixedValue( dataprocessor.toHtml( input, false, true, editor.config.docType ) ) );
+ assert.areEqual( output, getFixedValue( dataprocessor.toFullPageHtml( input, false, true, editor.config.docType ) ) );
},
@@ -200,5 +191,5 @@
editor.config.contentsLangDirection = null;
- assert.areEqual( output, getFixedValue( dataprocessor.toHtml( input, false, true, editor.config.docType ) ) );
+ assert.areEqual( output, getFixedValue( dataprocessor.toFullPageHtml( input, false, true, editor.config.docType ) ) );
},
@@ -216,17 +207,4 @@
},
- /**
- * Test 'toDataFormat' when input is a complete document, and 'config.fullPage' is set to XHTML.
- */
- test_htmldataprocessor_toDataFormat_fullpage_on : function()
- {
- var editor = ts2.editor,
- dataprocessor = editor.dataProcessor,
- input = getFixedContent( 'html-fullpage-xhtml' ),
- output = input;
-
- dataprocessor.writer._.rules = {};
- assert.areEqual( output, getFixedValue( dataprocessor.toDataFormat( input, false, true ) ) );
- },
name : document.title + '2'