diff options
author | Michał Gołębiowski-Owczarek <m.goleb@gmail.com> | 2019-12-08 22:23:08 +0100 |
---|---|---|
committer | Michał Gołębiowski-Owczarek <m.goleb@gmail.com> | 2019-12-08 22:23:08 +0100 |
commit | 98b539171b6e805fa79346a5e9896865e5213b9c (patch) | |
tree | f6c296195f081c538f90c96f43f28012670960a5 /tests/unit/dialog | |
parent | 74f8a0ac952f6f45f773312292baef1c26d81300 (diff) | |
download | jquery-ui-98b539171b6e805fa79346a5e9896865e5213b9c.tar.gz jquery-ui-98b539171b6e805fa79346a5e9896865e5213b9c.zip |
All: Migrate away from deprecated/removed Core APIs
Summary of the changes:
* Build: Add jQuery 3.2.0-3.4.1 to versions UI can be tested against
* Build: Load jQuery & Migrate via HTTPS
* Build: Add package-lock.json to .gitignore
* Build: Update jQuery Migrate from 3.0.0 to 3.1.0
* Build: Allow to run tests against jQuery 3.x-git
* Build: Fix formatting according to JSCS rules
* Build: Disable JSCS for the inlined jQuery Color
* All: Switch from $.isArray to Array.isArray (jQuery.isArray will be
removed in jQuery 4.0)
* All: Switch from `$.isFunction( x )` to `typeof x === "function"`
(jQuery.isFunction will be removed in jQuery 4.0)
* All: Inline jQuery.isWindow as it'll be removed in jQuery 4.0
* Effects: Fix a timing issue in a variable declaration. Previously,
a jQuery object was created, chained & assigned to a variable that
was then accessed in a callback used inside of this chained
definition. Due to a timing difference in when the callback fired for
the first time in latest jQuery master, it was being called before
the variable was defined.
* Tests: Make dialog & draggable unit tests less strict (newest jQuery
returns fractional results in some cases, making comparisons fail when
there's a tiny difference)
* All: Migrate from $.trim to bare String.prototype.trim (jQuery.trim
will be deprecated in jQuery 3.5)
Closes gh-1901
Diffstat (limited to 'tests/unit/dialog')
-rw-r--r-- | tests/unit/dialog/deprecated.js | 2 | ||||
-rw-r--r-- | tests/unit/dialog/options.js | 22 |
2 files changed, 14 insertions, 10 deletions
diff --git a/tests/unit/dialog/deprecated.js b/tests/unit/dialog/deprecated.js index 973a90893..eac0e123d 100644 --- a/tests/unit/dialog/deprecated.js +++ b/tests/unit/dialog/deprecated.js @@ -50,7 +50,7 @@ QUnit.test( "buttons - deprecated options", function( assert ) { buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" ); assert.equal( buttons.length, 1, "correct number of buttons" ); assert.equal( buttons.attr( "id" ), "my-button-id", "correct id" ); - assert.equal( $.trim( buttons.text() ), "a button", "correct label" ); + assert.equal( String.prototype.trim.call( buttons.text() ), "a button", "correct label" ); assert.hasClasses( buttons, "additional-class" ); assert.deepEqual( buttons.button( "option", "icon" ), "ui-icon-cancel" ); assert.equal( buttons.button( "option", "showLabel" ), false ); diff --git a/tests/unit/dialog/options.js b/tests/unit/dialog/options.js index 1be2888e3..4d8e4f717 100644 --- a/tests/unit/dialog/options.js +++ b/tests/unit/dialog/options.js @@ -166,7 +166,7 @@ QUnit.test( "buttons - advanced", function( assert ) { buttons = element.dialog( "widget" ).find( ".ui-dialog-buttonpane button" ); assert.equal( buttons.length, 1, "correct number of buttons" ); assert.equal( buttons.attr( "id" ), "my-button-id", "correct id" ); - assert.equal( $.trim( buttons.text() ), "a button", "correct label" ); + assert.equal( String.prototype.trim.call( buttons.text() ), "a button", "correct label" ); assert.hasClasses( buttons, "additional-class" ); assert.deepEqual( buttons.button( "option", "icon" ), "ui-icon-cancel" ); assert.equal( buttons.button( "option", "showLabel" ), false ); @@ -210,22 +210,22 @@ QUnit.test( "closeText", function( assert ) { assert.expect( 4 ); var element = $( "<div></div>" ).dialog(); - assert.equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "Close", + assert.equal( String.prototype.trim.call( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "Close", "default close text" ); element.remove(); element = $( "<div></div>" ).dialog( { closeText: "foo" } ); - assert.equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "foo", + assert.equal( String.prototype.trim.call( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "foo", "closeText on init" ); element.remove(); element = $( "<div></div>" ).dialog().dialog( "option", "closeText", "bar" ); - assert.equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "bar", + assert.equal( String.prototype.trim.call( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "bar", "closeText via option method" ); element.remove(); element = $( "<div></div>" ).dialog( { closeText: "<span>foo</span>" } ); - assert.equal( $.trim( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "<span>foo</span>", + assert.equal( String.prototype.trim.call( element.dialog( "widget" ).find( ".ui-dialog-titlebar-close" ).text() ), "<span>foo</span>", "closeText is escaped" ); element.remove(); } ); @@ -251,21 +251,25 @@ QUnit.test( "height", function( assert ) { assert.expect( 4 ); var element = $( "<div></div>" ).dialog(); - assert.equal( element.dialog( "widget" ).outerHeight(), 150, "default height" ); + assert.ok( Math.abs( element.dialog( "widget" ).outerHeight() - 150 ) < 0.25, + "default height within 0.25 from expected" ); element.remove(); element = $( "<div></div>" ).dialog( { height: 237 } ); - assert.equal( element.dialog( "widget" ).outerHeight(), 237, "explicit height" ); + assert.ok( Math.abs( element.dialog( "widget" ).outerHeight() - 237 ) < 0.25, + "explicit height within 0.25 from expected" ); element.remove(); element = $( "<div></div>" ).dialog(); element.dialog( "option", "height", 238 ); - assert.equal( element.dialog( "widget" ).outerHeight(), 238, "explicit height set after init" ); + assert.ok( Math.abs( element.dialog( "widget" ).outerHeight() - 238 ) < 0.25, + "explicit height set after init within 0.25 from expected" ); element.remove(); element = $( "<div></div>" ).css( "padding", "20px" ) .dialog( { height: 240 } ); - assert.equal( element.dialog( "widget" ).outerHeight(), 240, "explicit height with padding" ); + assert.ok( Math.abs( element.dialog( "widget" ).outerHeight() - 240 ) < 0.25, + "explicit height with padding within 0.25 from expected" ); element.remove(); } ); |