@@ -7,6 +7,7 @@ if (typeof process !== "undefined") {
77var dom = require ( "./lib/dom" ) ;
88var ace = require ( "./ace" ) ;
99var assert = require ( "./test/assertions" ) ;
10+ var lang = require ( "./lib/lang" ) ;
1011
1112module . exports = {
1213 "test: ace edit" : function ( ) {
@@ -50,7 +51,7 @@ module.exports = {
5051 assert . equal ( "h" , editor . getValue ( ) ) ;
5152 document . body . removeChild ( el ) ;
5253 } ,
53- "test: destroy" : function ( done ) {
54+ "test: destroy" : async function ( done ) {
5455 var editor = ace . edit ( ) ;
5556 var mouseTarget = editor . renderer . getMouseEventTarget ( ) ;
5657 var textarea = editor . textInput . getElement ( ) ;
@@ -76,15 +77,14 @@ module.exports = {
7677 click ( mouseTarget ) ;
7778 assert . equal ( focusCalled , 1 ) ;
7879
79- setTimeout ( function ( ) {
80- assert . notOk ( ! ! editor . curOp ) ;
81-
82- // input commands on destroed editor without session do not throw errors
83- editor . setSession ( null ) ;
84- sendText ( textarea , "2" ) ;
85-
86- done ( ) ;
87- } ) ;
80+ await lang . sleep ( 0 ) ;
81+ assert . notOk ( ! ! editor . curOp ) ;
82+
83+ // input commands on destroed editor without session do not throw errors
84+ editor . setSession ( null ) ;
85+ sendText ( textarea , "2" ) ;
86+
87+ done ( ) ;
8888 } ,
8989 "test: useStrictCSP" : function ( ) {
9090 ace . config . set ( "useStrictCSP" , undefined ) ;
@@ -101,7 +101,7 @@ module.exports = {
101101 ace . config . set ( "useStrictCSP" , false ) ;
102102 assert . ok ( getStyleNode ( ) ) ;
103103 } ,
104- "test: resizeObserver" : function ( done ) {
104+ "test: resizeObserver" : async function ( done ) {
105105 var mockObserver = {
106106 disconnect : function ( ) { mockObserver . target = null ; } ,
107107 observe : function ( el ) {
@@ -131,31 +131,31 @@ module.exports = {
131131 assert . equal ( editor . renderer . $size . width , 100 ) ;
132132 editor . container . style . width = "200px" ;
133133 mockObserver . call ( ) ;
134- setTimeout ( function ( ) {
135- if ( editor . renderer . $resizeTimer . isPending ( ) )
136- editor . renderer . $resizeTimer . call ( ) ;
137- assert . equal ( editor . renderer . $size . width , 200 ) ;
138- editor . container . style . height = "200px" ;
139- mockObserver . call ( ) ;
140- setTimeout ( function ( ) {
141- assert . ok ( editor . renderer . $resizeTimer . isPending ( ) ) ;
142- editor . container . style . height = "100px" ;
143- mockObserver . call ( ) ;
144- setTimeout ( function ( ) {
145- assert . ok ( ! editor . renderer . $resizeTimer . isPending ( ) ) ;
146- editor . setOption ( "useResizeObserver" , false ) ;
147- editor . container . style . height = "300px" ;
148- mockObserver . call ( ) ;
149- assert . ok ( ! editor . renderer . $resizeObserver ) ;
150- editor . setOption ( "useResizeObserver" , true ) ;
151- assert . ok ( editor . renderer . $resizeObserver ) ;
152- if ( window . ResizeObserver === mockObserver . $create )
153- window . ResizeObserver = undefined ;
154- editor . destroy ( ) ;
155- done ( ) ;
156- } , 15 ) ;
157- } , 15 ) ;
158- } , 15 ) ;
134+
135+ await lang . sleep ( 15 ) ;
136+ if ( editor . renderer . $resizeTimer . isPending ( ) )
137+ editor . renderer . $resizeTimer . call ( ) ;
138+ assert . equal ( editor . renderer . $size . width , 200 ) ;
139+ editor . container . style . height = "200px" ;
140+ mockObserver . call ( ) ;
141+
142+ await lang . sleep ( 15 ) ;
143+ assert . ok ( editor . renderer . $resizeTimer . isPending ( ) ) ;
144+ editor . container . style . height = "100px" ;
145+ mockObserver . call ( ) ;
146+
147+ await lang . sleep ( 15 ) ;
148+ assert . ok ( ! editor . renderer . $resizeTimer . isPending ( ) ) ;
149+ editor . setOption ( "useResizeObserver" , false ) ;
150+ editor . container . style . height = "300px" ;
151+ mockObserver . call ( ) ;
152+ assert . ok ( ! editor . renderer . $resizeObserver ) ;
153+ editor . setOption ( "useResizeObserver" , true ) ;
154+ assert . ok ( editor . renderer . $resizeObserver ) ;
155+ if ( window . ResizeObserver === mockObserver . $create )
156+ window . ResizeObserver = undefined ;
157+ editor . destroy ( ) ;
158+ done ( ) ;
159159 } ,
160160 "test: edit template" : function ( ) {
161161 var template = document . createElement ( "template" ) ;
0 commit comments