Skip to content

Commit

Permalink
Merge branch i/6202-remove-env.isEdge to master.
Browse files Browse the repository at this point in the history
Internal: Removed mentions on Edge. See #6202.
  • Loading branch information
Reinmar committed Apr 20, 2020
2 parents 3c7c721 + eb25ece commit fa71bdd
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 24 deletions.
19 changes: 0 additions & 19 deletions packages/ckeditor5-table/tests/converters/downcast.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtest
import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';

import TableEditing from '../../src/tableediting';
import env from '@ckeditor/ckeditor5-utils/src/env';
import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils/view';
import { setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
Expand Down Expand Up @@ -47,9 +46,6 @@ describe( 'downcast converters', () => {
describe( 'downcastInsertTable()', () => {
// The beforeEach is duplicated due to ckeditor/ckeditor5#6574. New test are written using TableEditing.
beforeEach( () => {
// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

return VirtualTestEditor.create()
.then( newEditor => {
editor = newEditor;
Expand Down Expand Up @@ -360,9 +356,6 @@ describe( 'downcast converters', () => {
describe( 'downcastInsertRow()', () => {
// The beforeEach is duplicated due to ckeditor/ckeditor5#6574. New test are written using TableEditing.
beforeEach( () => {
// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

return VirtualTestEditor.create()
.then( newEditor => {
editor = newEditor;
Expand Down Expand Up @@ -615,9 +608,6 @@ describe( 'downcast converters', () => {
describe( 'downcastInsertCell()', () => {
// The beforeEach is duplicated due to ckeditor/ckeditor5#6574. New test are written using TableEditing.
beforeEach( () => {
// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

return VirtualTestEditor.create()
.then( newEditor => {
editor = newEditor;
Expand Down Expand Up @@ -777,9 +767,6 @@ describe( 'downcast converters', () => {
describe( 'downcastTableHeadingColumnsChange()', () => {
// The beforeEach is duplicated due to ckeditor/ckeditor5#6574. New test are written using TableEditing.
beforeEach( () => {
// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

return VirtualTestEditor.create()
.then( newEditor => {
editor = newEditor;
Expand Down Expand Up @@ -971,9 +958,6 @@ describe( 'downcast converters', () => {
describe( 'downcastTableHeadingRowsChange()', () => {
// The beforeEach is duplicated due to ckeditor/ckeditor5#6574. New test are written using TableEditing.
beforeEach( () => {
// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

return VirtualTestEditor.create( { plugins: [ Paragraph, TableEditing ] } )
.then( newEditor => {
editor = newEditor;
Expand Down Expand Up @@ -1196,9 +1180,6 @@ describe( 'downcast converters', () => {
describe( 'downcastRemoveRow()', () => {
// The beforeEach is duplicated due to ckeditor/ckeditor5#6574. New test are written using TableEditing.
beforeEach( async () => {
// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

editor = await VirtualTestEditor.create( { plugins: [ Paragraph, TableEditing ] } );

model = editor.model;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import { getData as getViewData } from '@ckeditor/ckeditor5-engine/src/dev-utils
import { defaultConversion, defaultSchema, viewTable } from '../_utils/utils';
import injectTableCellRefreshPostFixer from '../../src/converters/table-cell-refresh-post-fixer';

import env from '@ckeditor/ckeditor5-utils/src/env';
import testUtils from '@ckeditor/ckeditor5-core/tests/_utils/utils';
import ClassicTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/classictesteditor';

Expand All @@ -26,9 +25,6 @@ describe( 'Table cell refresh post-fixer', () => {
element = document.createElement( 'div' );
document.body.appendChild( element );

// Most tests assume non-edge environment but we do not set `contenteditable=false` on Edge so stub `env.isEdge`.
testUtils.sinon.stub( env, 'isEdge' ).get( () => false );

return ClassicTestEditor.create( element, { extraPlugins: [ Delete ] } )
.then( newEditor => {
editor = newEditor;
Expand Down
1 change: 0 additions & 1 deletion packages/ckeditor5-table/tests/converters/upcasttable.js
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ describe( 'upcastTable()', () => {
} );

it( 'should fix if inside other blocks', () => {
// Using <div> instead of <p> as it breaks on Edge.
editor.model.schema.register( 'div', {
inheritAllFrom: '$block'
} );
Expand Down

0 comments on commit fa71bdd

Please sign in to comment.