jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331338 )
Change subject: actions: Add token to LINK_ABANDON_*
......................................................................
actions: Add token to LINK_ABANDON_*
Change-Id: I7f6187f6c0249c112a08163a343d35ee75cf85e8
---
M resources/ext.popups/actions.js
M tests/qunit/ext.popups/actions.test.js
2 files changed, 25 insertions(+), 8 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index eb611ef..37e267b 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -200,17 +200,21 @@
* @return {Object}
*/
actions.linkAbandon = function ( el ) {
- return function ( dispatch ) {
+ return function ( dispatch, getState ) {
+ var token = getState().preview.activeToken;
+
dispatch( timedAction( {
type: types.LINK_ABANDON_START,
- el: el
+ el: el,
+ token: token
} ) );
mw.popups.wait( ABANDON_END_DELAY )
.then( function () {
dispatch( {
type: types.LINK_ABANDON_END,
- el: el
+ el: el,
+ token: token
} );
} );
};
diff --git a/tests/qunit/ext.popups/actions.test.js
b/tests/qunit/ext.popups/actions.test.js
index 6f5597b..146c387 100644
--- a/tests/qunit/ext.popups/actions.test.js
+++ b/tests/qunit/ext.popups/actions.test.js
@@ -276,16 +276,25 @@
QUnit.test( 'it should dispatch start and end actions', function (
assert ) {
var that = this,
dispatch = that.sandbox.spy(),
+ token = '0123456789',
+ getState = function () {
+ return {
+ preview: {
+ activeToken: token
+ }
+ };
+ },
done = assert.async();
this.sandbox.stub( mw, 'now' ).returns( new Date() );
- mw.popups.actions.linkAbandon( that.el )( dispatch );
+ mw.popups.actions.linkAbandon( that.el )( dispatch, getState );
assert.ok( dispatch.calledWith( {
type: 'LINK_ABANDON_START',
el: that.el,
- timestamp: mw.now()
+ timestamp: mw.now(),
+ token: token
} ) );
// ---
@@ -296,10 +305,14 @@
);
that.waitPromise.then( function () {
- assert.ok( dispatch.calledWith( {
+ assert.ok(
+ dispatch.calledWith( {
type: 'LINK_ABANDON_END',
- el: that.el
- } ) );
+ el: that.el,
+ token: token
+ } ),
+ 'LINK_ABANDON_* share the same token.'
+ );
done();
} );
--
To view, visit https://gerrit.wikimedia.org/r/331338
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f6187f6c0249c112a08163a343d35ee75cf85e8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
