wikimedia/mediawiki-extensions-Popups
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Popups synced 2024-12-01 02:36:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "reducers: Make PREVIEW_SHOW require a token"

Browse source
This commit is contained in:
jenkins-bot 2017-04-11 16:59:16 +00:00 committed by Gerrit Code Review
parent ecdb6e4821 76b8c18ca5
commit a42c422f08
4 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/dist/index.js vendored
View file

Binary file not shown.

BIN
resources/dist/index.js.map vendored
View file

Binary file not shown.

3
src/reducers/eventLogging.js
View file

@ -84,7 +84,8 @@ module.exports = function ( state, action ) {
var nextCount,
actionTypesWithTokens = [
actionTypes.FETCH_COMPLETE,
actionTypes.ABANDON_END
actionTypes.ABANDON_END,
actionTypes.PREVIEW_SHOW
];
if ( state === undefined ) {

19
tests/node-qunit/reducers/eventLogging.test.js
View file

@ -111,7 +111,8 @@ QUnit.test( 'EVENT_LOGGED', function ( assert ) {
QUnit.test( 'PREVIEW_SHOW', function ( assert ) {
var state,
count = 22,
expectedCount = count + 1;
expectedCount = count + 1,
token = '1234567890';
state = {
previewCount: count,
@ -121,11 +122,14 @@ QUnit.test( 'PREVIEW_SHOW', function ( assert ) {
event: undefined,
// state.interaction.started is used in this part of the reducer.
interaction: {}
interaction: {
token: token
}
};
state = eventLogging( state, {
type: 'PREVIEW_SHOW'
type: 'PREVIEW_SHOW',
token: token
} );
assert.equal(
@ -284,7 +288,8 @@ QUnit.test( 'LINK_CLICK should enqueue an "opened" event', function ( assert ) {
QUnit.test( 'PREVIEW_SHOW should update the perceived wait time of the interaction', function ( assert ) {
var state,
now = Date.now();
now = Date.now(),
token = '1234567890';
state = {
interaction: undefined
@ -293,18 +298,19 @@ QUnit.test( 'PREVIEW_SHOW should update the perceived wait time of the interacti
state = eventLogging( state, {
type: 'LINK_DWELL',
el: this.link,
token: '0987654321',
token: token,
timestamp: now
} );
state = eventLogging( state, {
type: 'PREVIEW_SHOW',
token: token,
timestamp: now + 500
} );
assert.deepEqual( state.interaction, {
link: this.link,
token: '0987654321',
token: token,
started: now,
isUserDwelling: true,
@ -493,6 +499,7 @@ QUnit.test( 'ABANDON_END should enqueue an event', function ( assert ) {
state = eventLogging( dwelledState, {
type: 'PREVIEW_SHOW',
token: token,
timestamp: now + 700
} );