Index: tests/qunit/editor/index.html =================================================================== --- tests/qunit/editor/index.html (revision 31715) +++ tests/qunit/editor/index.html (working copy) @@ -1,87 +1,62 @@ + WordPress TinyMCE QUnit tests + - TinyMCE QUnit tests - - - - - - - -
-
-
- - - - - - - + + + + - - - - - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -93,24 +68,14 @@ - - - + - - + + +
+
+
Index: tests/qunit/editor/plugins/lists.js =================================================================== --- tests/qunit/editor/plugins/lists.js (revision 31715) +++ tests/qunit/editor/plugins/lists.js (working copy) @@ -16,7 +16,7 @@ tinymce.init({ selector: '#elm1', - plugins: wpPlugins, + plugins: "lists", add_unload_trigger: false, skin: false, indent: false, Index: tests/qunit/editor/plugins/media.js =================================================================== --- tests/qunit/editor/plugins/media.js (revision 31715) +++ tests/qunit/editor/plugins/media.js (working copy) @@ -6,7 +6,7 @@ selector: "textarea", add_unload_trigger: false, skin: false, - plugins: wpPlugins, + plugins: 'media', document_base_url: '/tinymce/tinymce/trunk/tests/', media_scripts: [ {filter: 'http://media1.tinymce.com'}, Index: tests/qunit/editor/plugins/paste.js =================================================================== --- tests/qunit/editor/plugins/paste.js (revision 31715) +++ tests/qunit/editor/plugins/paste.js (working copy) @@ -7,8 +7,7 @@ add_unload_trigger: false, skin: false, indent: false, - plugins: wpPlugins, - wp_paste_filters: false, + plugins: 'paste', setup: function(ed) { ed.on('NodeChange', false); }, @@ -52,7 +51,7 @@ editor.selection.setRng(rng); editor.execCommand('mceInsertClipboardContent', false, {content: 'TEST'}); - equal(editor.getContent(), '

1TEST4

'); // Changed in WordPress + equal(editor.getContent(), '

1TEST4

'); }); test("Paste paragraph in paragraph", function() { @@ -713,14 +712,14 @@ editor.execCommand('mceInsertClipboardContent', false, {content: 'Test'}); equal(editor.getContent(), '

Test

'); }); -/* WP set to always remove font-family on WebKit with a filtering callback. + test('paste webkit remove runtime styles (font-family)', function() { editor.settings.paste_webkit_styles = 'font-family'; editor.setContent(''); editor.execCommand('mceInsertClipboardContent', false, {content: 'Test'}); equal(editor.getContent(), '

Test

'); }); -WP end */ + test('paste webkit remove runtime styles font-family allowed but not specified', function() { editor.settings.paste_webkit_styles = 'font-family'; editor.setContent(''); Index: tests/qunit/editor/tinymce/Editor.js =================================================================== --- tests/qunit/editor/tinymce/Editor.js (revision 31715) +++ tests/qunit/editor/tinymce/Editor.js (working copy) @@ -5,7 +5,6 @@ tinymce.init({ selector: "#elm1", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, skin: false, @@ -27,7 +26,6 @@ tinymce.init({ selector: "#elm2", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, skin: false, @@ -309,7 +307,6 @@ tinymce.init({ selector: "#elmx", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, skin: false, Index: tests/qunit/editor/tinymce/EditorCommands.js =================================================================== --- tests/qunit/editor/tinymce/EditorCommands.js (revision 31715) +++ tests/qunit/editor/tinymce/EditorCommands.js (working copy) @@ -4,7 +4,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, indent: false, Index: tests/qunit/editor/tinymce/EditorManager.js =================================================================== --- tests/qunit/editor/tinymce/EditorManager.js (revision 31715) +++ tests/qunit/editor/tinymce/EditorManager.js (working copy) @@ -4,7 +4,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, skin: false, Index: tests/qunit/editor/tinymce/EnterKey.js =================================================================== --- tests/qunit/editor/tinymce/EnterKey.js (revision 31715) +++ tests/qunit/editor/tinymce/EnterKey.js (working copy) @@ -4,7 +4,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, indent: false, Index: tests/qunit/editor/tinymce/ForceBlocks.js =================================================================== --- tests/qunit/editor/tinymce/ForceBlocks.js (revision 31715) +++ tests/qunit/editor/tinymce/ForceBlocks.js (working copy) @@ -5,7 +5,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, indent: false, skin: false, Index: tests/qunit/editor/tinymce/Formatter_apply.js =================================================================== --- tests/qunit/editor/tinymce/Formatter_apply.js (revision 31715) +++ tests/qunit/editor/tinymce/Formatter_apply.js (working copy) @@ -5,8 +5,7 @@ tinymce.init({ selector: "#elm1", - plugins: wpPlugins, - external_plugins: { noneditable: '../../../../tests/qunit/editor/external-plugins/noneditable/plugin.min.js' }, // WP + plugins: "noneditable", add_unload_trigger: false, skin: false, indent: false, @@ -29,7 +28,6 @@ tinymce.init({ selector: "#elm2", - plugins: wpPlugins, inline: true, add_unload_trigger: false, skin: false, @@ -1642,4 +1640,4 @@ equal(getContent(), '

1 1234 1

'); } }); -}); +}); \ No newline at end of file Index: tests/qunit/editor/tinymce/Formatter_check.js =================================================================== --- tests/qunit/editor/tinymce/Formatter_check.js (revision 31715) +++ tests/qunit/editor/tinymce/Formatter_check.js (working copy) @@ -5,7 +5,6 @@ tinymce.init({ selector: "#elm1", - plugins: wpPlugins, add_unload_trigger: false, extended_valid_elements: 'b,i,span[style|contenteditable]', skin: false, @@ -24,7 +23,6 @@ tinymce.init({ selector: "#elm2", - plugins: wpPlugins, inline: true, add_unload_trigger: false, indent: false, Index: tests/qunit/editor/tinymce/Formatter_remove.js =================================================================== --- tests/qunit/editor/tinymce/Formatter_remove.js (revision 31715) +++ tests/qunit/editor/tinymce/Formatter_remove.js (working copy) @@ -5,8 +5,7 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, - external_plugins: { noneditable: '../../../../tests/qunit/editor/external-plugins/noneditable/plugin.min.js' }, // WP + plugins: "noneditable", indent: false, add_unload_trigger: false, skin: false, Index: tests/qunit/editor/tinymce/Shortcuts.js =================================================================== --- tests/qunit/editor/tinymce/Shortcuts.js (revision 31715) +++ tests/qunit/editor/tinymce/Shortcuts.js (working copy) @@ -4,7 +4,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, indent: false, Index: tests/qunit/editor/tinymce/UndoManager.js =================================================================== --- tests/qunit/editor/tinymce/UndoManager.js (revision 31715) +++ tests/qunit/editor/tinymce/UndoManager.js (working copy) @@ -4,7 +4,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, skin: false, init_instance_callback: function(ed) { Index: tests/qunit/editor/tinymce/dom/Selection.js =================================================================== --- tests/qunit/editor/tinymce/dom/Selection.js (revision 31715) +++ tests/qunit/editor/tinymce/dom/Selection.js (working copy) @@ -4,7 +4,6 @@ tinymce.init({ selector: "textarea", - plugins: wpPlugins, add_unload_trigger: false, skin: false, forced_root_block: '', Index: tests/qunit/editor/tinymce/dom/TridentSelection.js =================================================================== --- tests/qunit/editor/tinymce/dom/TridentSelection.js (revision 31715) +++ tests/qunit/editor/tinymce/dom/TridentSelection.js (working copy) @@ -10,7 +10,6 @@ tinymce.init({ selector: "textarea", elements: "elm1", - plugins: wpPlugins, add_unload_trigger: false, disable_nodechange: true, skin: false, Index: tests/qunit/editor/tinymce/html/Obsolete.js =================================================================== --- tests/qunit/editor/tinymce/html/Obsolete.js (revision 31715) +++ tests/qunit/editor/tinymce/html/Obsolete.js (working copy) @@ -1,263 +0,0 @@ -module( 'tinymce.html.Obsolete', { - setupModule: function() { - QUnit.stop(); - - tinymce.init({ - selector: 'textarea', - plugins: wpPlugins, - add_unload_trigger : false, - skin: false, - indent : false, - entities : 'raw', - plugins: 'media', - convert_urls : false, - init_instance_callback : function(ed) { - window.editor = ed; - QUnit.start(); - } - }); - } -}); - -/** - * Test whether attribute exists in a HTML string - * - * @param html The HTML string - * @param attr string|object When string, test for the first instance of attr. - * When object, break up the HTML string into individual tags and test for attr in the specified tag. - * Format: { tagName: 'attr1 attr2', ... } - * @return bool - */ -function hasAttr( html, attr ) { - var tagName, tags, tag, array, regex, i; - - if ( typeof attr === 'string' ) { - return new RegExp( ' \\b' + attr + '\\b' ).test( html ); - } - - for ( tagName in attr ) { - if ( tags = html.match( new RegExp( '<' + tagName + ' [^>]+>', 'g' ) ) ) { - for ( tag in tags ) { - array = attr[tagName].split(' '); - - for ( i in array ) { - regex = new RegExp( '\\b' + array[i] + '\\b' ); - - if ( regex.test( tags[tag] ) ) { - attr[tagName] = attr[tagName].replace( regex, '' ); - } - } - } - - if ( attr[tagName].replace( / +/g, '' ).length ) { - return false; - } - } - } - return true; -} - -// Ref: http://www.w3.org/TR/html5/obsolete.html, http://developers.whatwg.org/obsolete.html - -test('HTML elements non-conforming to HTML 5.0', function() { - var testString; - - /* - Not supported, deprecated in HTML 4.0 or earlier, and/or proprietary: - applet - bgsound - dir - frame - frameset - noframes - isindex - listing - nextid - noembed - plaintext - rb - xmp - basefont - blink - marquee - multicol - nobr - spacer - - The rest are still supported in TinyMCE but "...must not be used by authors". - */ - - expect(6); - - text = 'acronym'; - testString = '

WWW

'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'strike, converted to span'; - editor.setContent( 'test' ); - equal( editor.getContent(), '

test

', text ); - - text = 'big'; - testString = '

test

'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'center'; - testString = '
test
'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'font, converted to span'; - editor.setContent( '

test

' ); - equal( editor.getContent(), '

test

', text ); - - text = 'tt'; - testString = '

test

'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); -}); - -test('Obsolete (but still conforming) HTML attributes', function() { - var testString; - - expect(3); - - text = 'border on '; - testString = '

'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'Old style anchors'; - testString = '

'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'maxlength, size on input type="number"'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { input: 'maxlength size' } ), text ); -}); - -test('Obsolete attributes in HTML 5.0', function() { - var testString, text; - - expect(22); - - text = 'charset, rev, shape, coords on elements'; - testString = '

test

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { a: 'charset rev shape coords' } ), text ); - - text = 'name, align, hspace, vspace on img elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { img: 'name align hspace vspace' } ), text ); - - text = 'name, align, hspace, vspace, on embed elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { embed: 'name align hspace vspace' } ), text ); - - text = 'archive, classid, code, codebase, codetype, declare, standby on object elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { object: 'archive classid code codebase codetype declare standby' } ), text ); - - text = 'type, valuetype on param elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { param: 'type valuetype' } ), text ); - - text = 'align, bgcolor, border, cellpadding, cellspacing, frame, rules, summary, width on table elements'; - testString = '
test
'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { table: 'align bgcolor border cellpadding cellspacing frame rules summary width' } ), text ); - - text = 'align, char, charoff, valign on tbody, thead, and tfoot elements'; - testString = '
testtest
'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { - thead: 'align char charoff valign', - tfoot: 'align char charoff valign', - tbody: 'align char charoff valign' - } ), text ); - - text = 'axis, align, bgcolor, char, charoff, height, nowrap, valign, width on td and th elements, scope on td elements'; - testString = '
testtest
'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { - th: 'axis align bgcolor char charoff height nowrap valign width', - td: 'axis align bgcolor char charoff height nowrap valign width scope' - } ), text ); - - text = 'align, bgcolor, char, charoff, valign on tr elements'; - testString = '
test
'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { tr: 'align bgcolor char charoff valign' } ), text ); - - text = 'clear on br elements'; - testString = '

test
test

'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'align on caption elements'; - testString = '
test
test
'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'align, char, charoff, valign, width on col elements'; - testString = '
testtest
'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { col: 'align char charoff valign width' } ), text ); - - text = 'align on div, h1—h6, input, legend, p elements'; - testString = '
1

1

1

test
'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'compact on dl elements'; - testString = '
1
'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'align, hspace, vspace on embed elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { embed: 'align hspace vspace' } ), text ); - - text = 'align, noshade, size, width on hr elements'; - testString = '
'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { hr: 'align noshade size width' } ), text ); - - text = 'align, frameborder, marginheight, marginwidth, scrolling on iframe elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { iframe: 'align frameborder marginheight marginwidth scrolling' } ), text ); - - text = 'type on li elements'; - testString = ''; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'align, border, hspace, vspace on object elements'; - testString = '

'; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { object: 'align border hspace vspace' } ), text ); - - text = 'compact on ol elements'; - testString = '
  1. test
'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); - - text = 'compact, type on ul elements'; - testString = ''; - editor.setContent( testString ); - ok( hasAttr( editor.getContent(), { ul: 'compact type' } ), text ); - - text = 'width on pre elements'; - testString = '
1
'; - editor.setContent( testString ); - equal( editor.getContent(), testString, text ); -}); Index: tests/qunit/editor/tinymce/html/Schema.js =================================================================== --- tests/qunit/editor/tinymce/html/Schema.js (revision 31715) +++ tests/qunit/editor/tinymce/html/Schema.js (working copy) @@ -162,13 +162,13 @@ expect(1); schema = new tinymce.html.Schema(); - deepEqual(schema.getBoolAttrs(), { // WP: include three additional bool attributes used in the "media" plugin. + deepEqual(schema.getBoolAttrs(), { "CONTROLS": {}, "LOOP": {}, "AUTOPLAY": {}, "SELECTED": {}, "READONLY": {}, "NOWRAP": {}, "NOSHADE": {}, "NORESIZE": {}, "NOHREF": {}, "MULTIPLE": {}, "ISMAP": {}, "DISABLED": {}, "DEFER": {}, "DECLARE": {}, "COMPACT": {}, "CHECKED": {}, - "allowfullscreen": {}, "controls": {}, "loop": {}, "autoplay": {}, "selected": {}, "readonly": {}, "mozallowfullscreen": {}, - "nowrap": {}, "noshade": {}, "noresize": {}, "nohref": {}, "multiple": {}, "ismap": {}, "disabled": {}, "defer": {}, - "declare": {}, "compact": {}, "checked": {}, "webkitallowfullscreen": {} + "controls": {}, "loop": {}, "autoplay": {}, "selected": {}, "readonly": {}, "nowrap": {}, + "noshade": {}, "noresize": {}, "nohref": {}, "multiple": {}, "ismap": {}, "disabled": {}, "defer": {}, + "declare": {}, "compact": {}, "checked": {} }); }); Index: tests/qunit/editor/tinymce/util/Quirks_webkit.js =================================================================== --- tests/qunit/editor/tinymce/util/Quirks_webkit.js (revision 31715) +++ tests/qunit/editor/tinymce/util/Quirks_webkit.js (working copy) @@ -5,7 +5,6 @@ tinymce.init({ selector: "textarea", elements: "elm1", - plugins: wpPlugins, add_unload_trigger: false, skin: false, indent: false,