Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Fixed resizer initial percentage values for sie images #308

Merged
merged 10 commits into from
Oct 3, 2019
Merged

Fixed resizer initial percentage values for sie images #308

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a842435
Tests: Added some integration tests for percent-based resizing.
mlewand Aug 19, 2019
c8f9181
Tests: Added test for other fixed case.
mlewand Aug 19, 2019
e5e9f02
Merge branch 'master' into t/306
mlewand Aug 19, 2019
f2ad315
Merge branch 'master' into t/306
Reinmar Sep 13, 2019
bc1c6d2
Tests: Avoid creating multiple editors.
mlewand Sep 17, 2019
729047f
Test: Corrected variable name.
mlewand Sep 20, 2019
a8bdc86
Tests: Removed duplicated code.
mlewand Sep 20, 2019
c771a72
Tests: Extracted common code.
mlewand Sep 20, 2019
1838622
Tests: Removed stray assignment.
mlewand Sep 20, 2019
90cee77
Tests: Editor is now created for 2st level test suites.
mlewand Sep 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 84 additions & 0 deletions tests/imageresize.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,90 @@ describe( 'ImageResize', () => {
}
} );

describe( 'percent resizing', () => {
describe( 'standard image', () => {
beforeEach( async () => {
await editor.destroy();
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is odd. Please create the right editor for the specific describe block. Creating 2 editors for no reason is both confusing and slows down the tests.


editor = await ClassicEditor
.create( editorElement, {
plugins: [ Image, ImageStyle, Paragraph, Undo, Table, ImageResize ]
} );

setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]` );

view = editor.editing.view;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This duplicates the code from the topmost beforeEach().

viewDocument = view.document;
widget = viewDocument.getRoot().getChild( 1 );
} );

it( 'shrinks correctly with left-bottom handler', generateResizeTest( {
expectedWidth: 16,
modelRegExp: /<paragraph>foo<\/paragraph><image src=".+?" width="([\d]{2}(?:\.[\d]{1,2}))%"><\/image>/,
pointerOffset: {
x: 10,
y: -10
},
resizerPosition: 'bottom-left'
} ) );

it( 'enlarges correctly with right-bottom handler', generateResizeTest( {
expectedWidth: 22,
modelRegExp: /<paragraph>foo<\/paragraph><image src=".+?" width="([\d]{2}(?:\.[\d]{1,2}))%"><\/image>/,
pointerOffset: {
x: 0,
y: 5
},
resizerPosition: 'bottom-right'
} ) );

it( 'enlarges correctly an image with unsupported width unit', async () => {
setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }" width="50pt"></image>]` );

view = editor.editing.view;
viewDocument = view.document;
widget = viewDocument.getRoot().getChild( 1 );

await generateResizeTest( {
expectedWidth: 15,
modelRegExp: /<paragraph>foo<\/paragraph><image src=".+?" width="([\d]{2}(?:\.[\d]{1,2}))%"><\/image>/,
pointerOffset: {
x: 0,
y: 5
},
resizerPosition: 'bottom-right'
} )();
} );
} );

describe( 'side image', () => {
beforeEach( async () => {
await editor.destroy();

editor = await ClassicEditor
.create( editorElement, {
plugins: [ Image, ImageStyle, Paragraph, Undo, Table, ImageResize ]
} );

setData( editor.model, `<paragraph>foo</paragraph>[<image imageStyle="side" src="${ IMAGE_SRC_FIXTURE }"></image>]` );

view = editor.editing.view;
viewDocument = view.document;
widget = viewDocument.getRoot().getChild( 1 );
} );

it( 'shrinks correctly with left-bottom handler', generateResizeTest( {
expectedWidth: 18,
modelRegExp: /<paragraph>foo<\/paragraph><image imageStyle="side" src=".+?" width="([\d]{2}(?:\.[\d]{1,2}))%"><\/image>/,
pointerOffset: {
x: 10,
y: -10
},
resizerPosition: 'bottom-left'
} ) );
} );
} );

describe( 'undo integration', () => {
beforeEach( () => {
setData( editor.model, `<paragraph>foo</paragraph>[<image src="${ IMAGE_SRC_FIXTURE }"></image>]` );
Expand Down