diff --git a/tests/_benderjs/ckeditor/static/tools.js b/tests/_benderjs/ckeditor/static/tools.js
index 231a388fa6e..6361a53e0f8 100644
--- a/tests/_benderjs/ckeditor/static/tools.js
+++ b/tests/_benderjs/ckeditor/static/tools.js
@@ -811,11 +811,11 @@
/**
* Returns an object to mock drop event with `dataTransfer` object and `preventDefault`
- * `getTarget` methods. To mock target new text mode is created with 'targetMock' string.
+ * `getTarget` methods. To mock target new text node is created with 'targetMock' string.
*/
mockDropEvent: function() {
var dataTransfer = this.mockNativeDataTransfer(),
- target = new CKEDITOR.dom.node( 'targetMock' );
+ target = new CKEDITOR.dom.text( 'targetMock' );
target.isReadOnly = function() {
return false;
diff --git a/tests/plugins/clipboard/drop.js b/tests/plugins/clipboard/drop.js
index a804e744b02..0cafb059ec0 100644
--- a/tests/plugins/clipboard/drop.js
+++ b/tests/plugins/clipboard/drop.js
@@ -27,7 +27,9 @@ function drag( editor, evt ) {
assert.isInstanceOf( CKEDITOR.plugins.clipboard.dataTransfer, dragEvt.data.dataTransfer );
assert.areSame( evt.$, dragEvt.data.$ );
- assert.areSame( 'targetMock', dragEvt.data.target.$ );
+ // Check that it's the mocked dragstart target created by the mockDropEvent().
+ assert.areSame( CKEDITOR.NODE_TEXT, dragEvt.data.target.type, 'drag target node type' );
+ assert.areSame( 'targetMock', dragEvt.data.target.getText(), 'drag target node' );
} );
dropTarget.fire( 'dragstart', evt );
@@ -43,7 +45,7 @@ function drop( editor, evt, config, onDrop, onFinish ) {
expectedPasteEventCount = typeof config.expectedPasteEventCount !== 'undefined' ? config.expectedPasteEventCount : 1,
expectedBeforePasteEventCount = typeof config.expectedBeforePasteEventCount !== 'undefined' ? config.expectedBeforePasteEventCount : expectedPasteEventCount;
- range.setStart( config.element, config.offset );
+ range.setStart( config.dropContainer, config.dropOffset );
range.collapse( true );
range.select();
@@ -61,11 +63,11 @@ function drop( editor, evt, config, onDrop, onFinish ) {
values.dropRangeStartContainerMatch = !!dropEvt.data.dropRange.startContainer;
values.dropRangeStartOffsetMatch = !!dropEvt.data.dropRange.startOffset;
} else {
- values.dropRangeStartContainerMatch = config.element == dropEvt.data.dropRange.startContainer;
- values.dropRangeStartOffsetMatch = config.offset == dropEvt.data.dropRange.startOffset;
+ values.dropRangeStartContainerMatch = config.dropContainer == dropEvt.data.dropRange.startContainer;
+ values.dropRangeStartOffsetMatch = config.dropOffset == dropEvt.data.dropRange.startOffset;
}
values.dropNativeEventMatch = evt.$ == dropEvt.data.$;
- values.dropTarget = dropEvt.data.target.$;
+ values.dropTarget = dropEvt.data.target;
if ( onDrop ) {
return onDrop( dropEvt );
@@ -102,7 +104,9 @@ function drop( editor, evt, config, onDrop, onFinish ) {
assert.isTrue( values.dropRangeStartContainerMatch, 'On drop: drop range start offset should match.' );
assert.isTrue( values.dropNativeEventMatch, 'On drop: native event should match.' );
- assert.areSame( 'targetMock', values.dropTarget, 'On drop: drop target should match.' );
+ // Check that it's the mocked drop target created by the mockDropEvent().
+ assert.areSame( CKEDITOR.NODE_TEXT, values.dropTarget.type, 'On drop: drop target node type should match.' );
+ assert.areSame( 'targetMock', values.dropTarget.getText(), 'On drop: drop target should match.' );
// Paste event asserts
assert.areSame( expectedBeforePasteEventCount, values.beforePasteEventCounter, 'Before paste event should be called ' + expectedBeforePasteEventCount + ' time(s).' );
@@ -202,8 +206,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.h1' ).getChild( 0 ),
- offset: 7,
+ dropContainer: editor.editable().findOne( '.h1' ).getChild( 0 ),
+ dropOffset: 7,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'dolor',
expectedHtml: 'dolor',
@@ -228,8 +232,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 6,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 6,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'dolor',
expectedHtml: 'dolor',
@@ -254,8 +258,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 2 ),
- offset: 11,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 2 ),
+ dropOffset: 11,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'ipsum',
expectedHtml: 'ipsum',
@@ -280,10 +284,10 @@ var testsForMultipleEditor = {
drop( editor, evt, {
// IE8 split text node anyway so we need different drop position there.
- element: CKEDITOR.env.ie && CKEDITOR.env.version == 8 ?
+ dropContainer: CKEDITOR.env.ie && CKEDITOR.env.version == 8 ?
editor.editable().findOne( '.p' ).getChild( 2 ) :
editor.editable().findOne( '.p' ).getChild( 1 ),
- offset: CKEDITOR.env.ie && CKEDITOR.env.version == 8 ?
+ dropOffset: CKEDITOR.env.ie && CKEDITOR.env.version == 8 ?
11 :
17,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
@@ -310,8 +314,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 2 ),
- offset: 16,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 2 ),
+ dropOffset: 16,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'ipsum',
expectedHtml: 'ipsum',
@@ -336,8 +340,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 0,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 0,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'ipsum',
expectedHtml: 'ipsum',
@@ -363,8 +367,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 1 ),
- offset: 4,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 1 ),
+ dropOffset: 4,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'ipsum',
expectedHtml: 'ipsum',
@@ -388,8 +392,8 @@ var testsForMultipleEditor = {
evt.$.dataTransfer.setData( 'Text', 'dolor' );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 6,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 6,
expectedTransferType: CKEDITOR.DATA_TRANSFER_EXTERNAL,
expectedText: 'dolor',
expectedHtml: '',
@@ -421,8 +425,8 @@ var testsForMultipleEditor = {
}
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 6,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 6,
expectedTransferType: CKEDITOR.DATA_TRANSFER_EXTERNAL,
expectedText: !isCustomDataTypesSupported ? 'dolor' : '',
expectedHtml: !isCustomDataTypesSupported ? '' : 'dolor',
@@ -451,8 +455,8 @@ var testsForMultipleEditor = {
editor.resetUndo();
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 6,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 6,
expectedBeforePasteEventCount: 1,
expectedPasteEventCount: 0
}, null, function() {
@@ -477,8 +481,8 @@ var testsForMultipleEditor = {
drag( editorCross, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 6,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 6,
expectedTransferType: CKEDITOR.DATA_TRANSFER_CROSS_EDITORS,
expectedText: 'ipsum dolor ',
expectedHtml: 'ipsum dolor ',
@@ -520,8 +524,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.drop1' ).getChild( 0 ),
- offset: 0,
+ dropContainer: editor.editable().findOne( '.drop1' ).getChild( 0 ),
+ dropOffset: 0,
expectedTransferType: CKEDITOR.DATA_TRANSFER_INTERNAL,
expectedText: 'drag1',
expectedHtml: 'drag1',
@@ -557,8 +561,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 0,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 0,
expectedPasteEventCount: 0
}, function() {
return false;
@@ -775,7 +779,8 @@ var testsForMultipleEditor = {
assert.areSame( 'foo', dragendEvt.data.dataTransfer.getData( 'Text' ), 'cke/custom' );
assert.areSame( evt.data.$, dragendEvt.data.$, 'nativeEvent' );
- assert.areSame( 'targetMock', dragendEvt.data.target.$, 'target' );
+ assert.areSame( CKEDITOR.NODE_TEXT, dragendEvt.data.target.type, 'drag target node type' );
+ assert.areSame( 'targetMock', dragendEvt.data.target.getText(), 'drag target node' );
} );
editable.fire( 'dragend', evt.data );
@@ -856,8 +861,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 0,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 0,
expectedPasteEventCount: 0
}, function() {
return false;
@@ -884,8 +889,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable(),
- offset: 2,
+ dropContainer: editor.editable(),
+ dropOffset: 2,
expectedPasteEventCount: 0
}, function() {
return false;
@@ -923,8 +928,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 0,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 0,
expectedPasteEventCount: 0
}, function() {
return false;
@@ -953,8 +958,8 @@ var testsForMultipleEditor = {
drag( editor, evt );
drop( editor, evt, {
- element: editor.editable().findOne( '.p' ).getChild( 0 ),
- offset: 0,
+ dropContainer: editor.editable().findOne( '.p' ).getChild( 0 ),
+ dropOffset: 0,
expectedBeforePasteEventCount: 1,
expectedPasteEventCount: 0
} );
diff --git a/tests/plugins/widget/dnd.js b/tests/plugins/widget/dnd.js
index 84c12ec48d2..0f256deacd7 100644
--- a/tests/plugins/widget/dnd.js
+++ b/tests/plugins/widget/dnd.js
@@ -45,21 +45,34 @@
var getWidgetById = widgetTestsTools.getWidgetById,
assertRelations = lineutilsTestsTools.assertRelations;
- function dragstart( editor, evt ) {
+ function dragstart( editor, evt, widget ) {
var dropTarget = CKEDITOR.plugins.clipboard.getDropTarget( editor );
+ // Use realistic target which is the drag handler.
+ evt.setTarget( widget.dragHandlerContainer.findOne( 'img' ) );
+
dropTarget.fire( 'dragstart', evt );
}
- function drop( editor, evt ) {
+ function drop( editor, evt, dropRange ) {
var dropTarget = CKEDITOR.env.ie && CKEDITOR.env.version < 9 ? editor.editable() : editor.document;
+ // If drop range is known use a realistic target. If no, then use a mock.
+ if ( dropRange ) {
+ evt.setTarget( dropRange.startContainer );
+ } else {
+ evt.setTarget( new CKEDITOR.dom.text( 'targetMock' ) );
+ }
+
dropTarget.fire( 'drop', evt );
}
- function dragend( editor, evt ) {
+ function dragend( editor, evt, widget ) {
var dropTarget = CKEDITOR.env.ie && CKEDITOR.env.version < 9 ? editor.editable() : editor.document;
+ // Use realistic target which is the drag handler.
+ evt.setTarget( widget.dragHandlerContainer.findOne( 'img' ) );
+
dropTarget.fire( 'dragend', evt );
}
@@ -239,7 +252,7 @@
assert.areSame( CKEDITOR.DATA_TRANSFER_INTERNAL, dataTransfer.getTransferType( editor ), 'Source editor should equal this.editor' );
} );
- dragstart( editor, evt );
+ dragstart( editor, evt, widget );
wait();
} );
@@ -257,11 +270,11 @@
widgetWasDestroyed += 1;
} );
- dragstart( editor, evt );
+ dragstart( editor, evt, widget );
drop( editor, evt );
- dragend( editor, evt );
+ dragend( editor, evt, widget );
assert.areSame( 'foo
', editor.getData() );
assert.areSame( 0, widgetWasDestroyed, 'Original widget should not be destroyed' );
@@ -285,8 +298,6 @@
drop( editor, evt.data );
- dragend( editor, evt.data );
-
assert.areSame( 'foo
', editor.getData() );
assert.areSame( 0, widgetWasDestroyed, 'Original widget should not be destroyed' );
} );
@@ -309,11 +320,11 @@
CKEDITOR.plugins.clipboard.initDragDataTransfer( evt );
evt.data.dataTransfer.setData( 'cke/widget-id', -1 );
- dragstart( editor, evt.data );
+ dragstart( editor, evt.data, widget );
drop( editor, evt.data );
- dragend( editor, evt.data );
+ dragend( editor, evt.data, widget );
wait( function() {
assert.areSame( 'foo
', editor.getData() );
@@ -359,18 +370,18 @@
// Ensure async.
wait( function() {
- dragstart( editor, evt.data );
+ dragstart( editor, evt.data, widget );
CKEDITOR.plugins.clipboard.initDragDataTransfer( evt );
- evt.data.dataTransfer.setData( 'cke/widget-id', getWidgetById( editor, 'w1' ).id );
+ evt.data.dataTransfer.setData( 'cke/widget-id', widget.id );
range.setStart( editor.document.findOne( '.x' ).getFirst(), 1 );
range.collapse( true );
evt.data.testRange = range;
- drop( editor, evt.data );
+ drop( editor, evt.data, range );
- dragend( editor, evt.data );
+ dragend( editor, evt.data, widget );
} );
} );
},
@@ -390,18 +401,20 @@
// Ensure async.
wait( function() {
- dragstart( editor, evt.data );
+ var widget = getWidgetById( editor, 'w1' );
+
+ dragstart( editor, evt.data, widget );
CKEDITOR.plugins.clipboard.initDragDataTransfer( evt );
- evt.data.dataTransfer.setData( 'cke/widget-id', getWidgetById( editor, 'w1' ).id );
+ evt.data.dataTransfer.setData( 'cke/widget-id', widget.id );
range.setStart( editor.document.findOne( '.x' ).getFirst(), 1 );
range.collapse( true );
evt.data.testRange = range;
- drop( editor, evt.data );
+ drop( editor, evt.data, range );
- dragend( editor, evt.data );
+ dragend( editor, evt.data, widget );
} );
} );
},
diff --git a/tests/plugins/widget/undo.js b/tests/plugins/widget/undo.js
index 0851250ac70..84e4be17048 100644
--- a/tests/plugins/widget/undo.js
+++ b/tests/plugins/widget/undo.js
@@ -346,12 +346,15 @@
evt = bender.tools.mockDropEvent();
evt.setTarget( editor.document.findOne( 'img.cke_widget_drag_handler' ) );
- evt.testRange = range;
-
dropTarget.fire( 'dragstart', evt );
+ // Use a realistic drop target for drop.
+ evt.setTarget( range.startContainer );
+ evt.testRange = range;
dropTarget.fire( 'drop', evt );
+ evt.setTarget( editor.document.findOne( 'img.cke_widget_drag_handler' ) );
+ evt.testRange = undefined;
dropTarget.fire( 'dragend', evt );
} );
} );