aboutsummaryrefslogtreecommitdiffstats
path: root/tests/unit/selectmenu
diff options
context:
space:
mode:
authorMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2019-12-08 22:23:08 +0100
committerMichał Gołębiowski-Owczarek <m.goleb@gmail.com>2019-12-08 22:23:08 +0100
commit98b539171b6e805fa79346a5e9896865e5213b9c (patch)
treef6c296195f081c538f90c96f43f28012670960a5 /tests/unit/selectmenu
parent74f8a0ac952f6f45f773312292baef1c26d81300 (diff)
downloadjquery-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/selectmenu')
-rw-r--r--tests/unit/selectmenu/core.js14
-rw-r--r--tests/unit/selectmenu/methods.js8
2 files changed, 11 insertions, 11 deletions
diff --git a/tests/unit/selectmenu/core.js b/tests/unit/selectmenu/core.js
index 708452312..b0f56f3b3 100644
--- a/tests/unit/selectmenu/core.js
+++ b/tests/unit/selectmenu/core.js
@@ -95,7 +95,7 @@ QUnit.test( "_renderButtonItem()", function( assert ) {
element.selectmenu( "refresh" );
option = element.find( "option:selected" );
assert.equal(
- $.trim( button.text() ),
+ String.prototype.trim.call( button.text() ),
option.text() + element[ 0 ].selectedIndex,
"refresh: button item text"
);
@@ -104,7 +104,7 @@ QUnit.test( "_renderButtonItem()", function( assert ) {
menu.find( "li" ).last().simulate( "mouseover" ).trigger( "click" );
option = element.find( "option" ).last();
assert.equal(
- $.trim( button.text() ),
+ String.prototype.trim.call( button.text() ),
option.text() + element[ 0 ].selectedIndex,
"click: button item text"
);
@@ -153,7 +153,7 @@ $.each( [
selected.val(),
"original select state"
);
- assert.equal( $.trim( button.text() ), selected.text(), "button text" );
+ assert.equal( String.prototype.trim.call( button.text() ), selected.text(), "button text" );
ready();
} );
} );
@@ -189,7 +189,7 @@ $.each( [
selected.val(),
"original select state"
);
- assert.equal( $.trim( button.text() ), selected.text(), "button text" );
+ assert.equal( String.prototype.trim.call( button.text() ), selected.text(), "button text" );
ready();
}, 1 );
} );
@@ -231,7 +231,7 @@ $.each( [
"button aria-activedescendant" );
assert.equal( element.find( "option:selected" ).val(), options.eq( 1 ).val(),
"original select state" );
- assert.equal( $.trim( button.text() ), options.eq( 1 ).text(), "button text" );
+ assert.equal( String.prototype.trim.call( button.text() ), options.eq( 1 ).text(), "button text" );
ready();
} );
} );
@@ -352,10 +352,10 @@ QUnit.test( "Selectmenu should reset when its parent form resets", function( ass
element.val( "Slower" );
element.selectmenu( "refresh" );
- assert.equal( $.trim( widget.text() ), "Slower" );
+ assert.equal( String.prototype.trim.call( widget.text() ), "Slower" );
form[ 0 ].reset();
setTimeout( function() {
- assert.equal( $.trim( widget.text() ), initialValue );
+ assert.equal( String.prototype.trim.call( widget.text() ), initialValue );
ready();
} );
} );
diff --git a/tests/unit/selectmenu/methods.js b/tests/unit/selectmenu/methods.js
index c25d01af5..2722fed01 100644
--- a/tests/unit/selectmenu/methods.js
+++ b/tests/unit/selectmenu/methods.js
@@ -83,21 +83,21 @@ QUnit.test( "refresh - change selected option", function( assert ) {
var element = $( "#speed" ).selectmenu(),
button = element.selectmenu( "widget" );
- assert.equal( $.trim( button.text() ), "Medium", "button text after init" );
+ assert.equal( String.prototype.trim.call( button.text() ), "Medium", "button text after init" );
button.simulate( "focus" );
setTimeout( function() {
- assert.equal( $.trim( button.text() ), "Medium", "button text after focus" );
+ assert.equal( String.prototype.trim.call( button.text() ), "Medium", "button text after focus" );
element[ 0 ].selectedIndex = 0;
element.selectmenu( "refresh" );
- assert.equal( $.trim( button.text() ), "Slower", "button text after changing selected option" );
+ assert.equal( String.prototype.trim.call( button.text() ), "Slower", "button text after changing selected option" );
element.find( "option" ).prop( "selected", false );
element.append( "<option selected value=\"selected_option\">Selected option</option>" );
element.selectmenu( "refresh" );
- assert.equal( $.trim( button.text() ), "Selected option", "button text after adding selected option" );
+ assert.equal( String.prototype.trim.call( button.text() ), "Selected option", "button text after adding selected option" );
ready();
} );