Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/236209
Change subject: Dont trigger event in mediawiki.ui.enhance test
......................................................................
Dont trigger event in mediawiki.ui.enhance test
Instead, directly call the method that the event triggers, to avoid
timing issues.
Bug: T111459
Change-Id: Iadb916bc801d1f4eb4748a7c6c2ee29d2d899073
---
M modules/engine/misc/mw-ui.enhance.js
M tests/qunit/engine/misc/test_mw-ui.enhance.js
2 files changed, 14 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/09/236209/1
diff --git a/modules/engine/misc/mw-ui.enhance.js
b/modules/engine/misc/mw-ui.enhance.js
index e0d5f7f..e088cc1 100644
--- a/modules/engine/misc/mw-ui.enhance.js
+++ b/modules/engine/misc/mw-ui.enhance.js
@@ -2,6 +2,9 @@
* Enhances mediawiki-ui style elements with JavaScript.
*/
+// Expose for the sake of tests
+mw.flow.ui.enhance = {};
+
/** @class mw.ui.enhance */
( function ( mw, $ ) {
/*
@@ -111,6 +114,10 @@
$form.find( '.mw-ui-button' ).filter( '[data-role=action],
[data-role=submit]' )
.prop( 'disabled', !ready );
}
+ // Expose for the sake of tests. This will be unnecessary and removed
when all
+ // instances of the editor are migrated to ooui
+ mw.flow.ui.enhance.enableFormWithRequiredFields =
enableFormWithRequiredFields;
+
/*
* Disable / enable submit buttons without/with text in field.
* Usage: field needs required attribute
diff --git a/tests/qunit/engine/misc/test_mw-ui.enhance.js
b/tests/qunit/engine/misc/test_mw-ui.enhance.js
index f845bb2..6f0d430 100644
--- a/tests/qunit/engine/misc/test_mw-ui.enhance.js
+++ b/tests/qunit/engine/misc/test_mw-ui.enhance.js
@@ -16,24 +16,20 @@
];
$.each( $forms, function () {
- this.appendTo( '#qunit-fixture' );
- this.find( '.mw-ui-input' ).trigger( 'keyup' );
+ mw.flow.ui.enhance.enableFormWithRequiredFields( this );
} );
- // See mw-ui.enhance.js for why setTimeout is used.
- this.clock.tick( 1000 );
-
- assert.strictEqual( $forms[0].find( 'button' ).is( ':disabled'
), true,
+ assert.strictEqual( $forms[0].find( 'button' ).prop( 'disabled'
), true,
'Buttons with data-role=action are disabled when
required fields are empty.' );
- assert.strictEqual( $forms[1].find( 'button' ).is( ':disabled'
), true,
+ assert.strictEqual( $forms[1].find( 'button' ).prop( 'disabled'
), true,
'Buttons with data-role=action are disabled when
required fields are empty.' );
- assert.strictEqual( $forms[2].find( 'button' ).is( ':disabled'
), false,
+ assert.strictEqual( $forms[2].find( 'button' ).prop( 'disabled'
), false,
'Buttons with are enabled when no required fields in
form.' );
- assert.strictEqual( $forms[3].find( 'button' ).is( ':disabled'
), true,
+ assert.strictEqual( $forms[3].find( 'button' ).prop( 'disabled'
), true,
'Buttons are disabled when textarea is required but
empty.' );
- assert.strictEqual( $forms[4].find( 'button' ).is( ':disabled'
), false,
+ assert.strictEqual( $forms[4].find( 'button' ).prop( 'disabled'
), false,
'Buttons are enabled when required textarea has text.'
);
- assert.strictEqual( $forms[5].find( 'button' ).is( ':disabled'
), true,
+ assert.strictEqual( $forms[5].find( 'button' ).prop( 'disabled'
), true,
'Buttons are disabled when required textarea but
required input does not.' );
} );
--
To view, visit https://gerrit.wikimedia.org/r/236209
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iadb916bc801d1f4eb4748a7c6c2ee29d2d899073
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
