jenkins-bot has submitted this change and it was merged.

Change subject: Turn off textcat subtest of search satisfaction
......................................................................


Turn off textcat subtest of search satisfaction

This test has been completed, so is safe to turn off. This is a partial
revert of Ia855716b9. By only partialy reverting it should be easier to
add back new tests in the future with less review.  Two jshint overrides
had to be added for things that are currently unused but will be used
again in the near future.

Bug: T134319
Change-Id: I6542ff7b35a64aef9bc2d6cbf20e56e187697cd6
(cherry picked from commit e29d16d45ede720713a1fef4446f78065b8744a4)
---
M modules/ext.wikimediaEvents.searchSatisfaction.js
1 file changed, 8 insertions(+), 35 deletions(-)

Approvals:
  Dereckson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ext.wikimediaEvents.searchSatisfaction.js 
b/modules/ext.wikimediaEvents.searchSatisfaction.js
index d62ef12..385559a 100644
--- a/modules/ext.wikimediaEvents.searchSatisfaction.js
+++ b/modules/ext.wikimediaEvents.searchSatisfaction.js
@@ -101,8 +101,7 @@
                function initialize( session ) {
 
                        var sessionId = session.get( 'sessionId' ),
-                               // increase enwiki sample size for textcat 
subtest
-                               sampleSize = mw.config.get( 'wgDBname' ) === 
'enwiki' ? 100 : 200,
+                               sampleSize = 200,
                                /**
                                 * Determines whether the user is part of the 
population size.
                                 *
@@ -125,7 +124,7 @@
                                 * @return {string}
                                 * @private
                                 */
-                               chooseBucket = function ( buckets ) {
+                               chooseBucket = function ( buckets ) { // jshint 
ignore:line
                                        var rand = 
mw.user.generateRandomSessionId(),
                                        // take the first 52 bits of the rand 
value to match js
                                        // integer precision
@@ -151,15 +150,6 @@
                                // have a search session id, generate one.
                                if ( !session.set( 'sessionId', randomToken() ) 
) {
                                        return false;
-                               }
-
-                               // Assign 50% of enwiki users to subTest
-                               if ( mw.config.get( 'wgDBname' ) === 'enwiki' 
&& oneIn( 2 ) ) {
-                                       session.set( 'subTest', chooseBucket( [
-                                               'textcat1:a',
-                                               'textcat1:b',
-                                               'textcat1:c'
-                                       ] ) );
                                }
                        }
 
@@ -203,7 +193,7 @@
                };
 
                this.refresh = function ( type ) {
-                       if ( ttl.hasOwnProperty( type ) ) {
+                       if ( ttl.hasOwnProperty( type ) && mw.storage.get( key( 
type ) ) !== null ) {
                                mw.storage.set( key( type + 'EndTime' ), now + 
ttl[ type ] );
                        }
                };
@@ -423,17 +413,7 @@
         * @param {SessionState} session
         */
        function setupSearchTest( session ) {
-               var textCatExtra = [],
-                       logEvent = genLogEventFn( 'fulltext', session );
-
-               // specific to textcat subtest
-               if ( mw.config.get( 'wgCirrusSearchAltLanguage' ) ) {
-                       textCatExtra = mw.config.get( 
'wgCirrusSearchAltLanguage' );
-               }
-               if ( mw.config.get( 'wgCirrusSearchAltLanguageNumResults' ) ) {
-                       textCatExtra.push( mw.config.get( 
'wgCirrusSearchAltLanguageNumResults' ) );
-               }
-               textCatExtra = textCatExtra.join( ',' );
+               var logEvent = genLogEventFn( 'fulltext', session );
 
                if ( isSearchResultPage ) {
                        // When a new search is performed reset the session 
lifetime.
@@ -449,16 +429,14 @@
                                        // test event, duplicated by visitPage 
event when
                                        // the user arrives.
                                        logEvent( 'click', {
-                                               position: $( evt.target ).data( 
'serp-pos' ),
-                                               extraParams: textCatExtra
+                                               position: $( evt.target ).data( 
'serp-pos' )
                                        } );
                                }
                        );
 
                        logEvent( 'searchResultPage', {
                                query: mw.config.get( 'searchTerm' ),
-                               hitsReturned: $( '.mw-search-result-heading' 
).length,
-                               extraParams: textCatExtra
+                               hitsReturned: $( '.mw-search-result-heading' 
).length
                        } );
                } else if ( search.cameFromSearch ) {
                        logEvent( 'visitPage', {
@@ -545,13 +523,8 @@
        // text setup, so wrap in atMostOnce to ensure it's
        // only run once.
        initSubTest = atMostOnce( function ( session ) {
-               if ( session.get( 'subTest' ) ) {
-                       $( '<input>' ).attr( {
-                               type: 'hidden',
-                               name: 'cirrusUserTesting',
-                               value: session.get( 'subTest' )
-                       } ).prependTo( $( 'input[type=search]' ).closest( 
'form' ) );
-               }
+               // jshint unused:false
+               // no sub test currently running
        } );
 
        /**

-- 
To view, visit https://gerrit.wikimedia.org/r/292048
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I6542ff7b35a64aef9bc2d6cbf20e56e187697cd6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/WikimediaEvents
Gerrit-Branch: wmf/1.28.0-wmf.3
Gerrit-Owner: EBernhardson <ebernhard...@wikimedia.org>
Gerrit-Reviewer: Dereckson <dereck...@espace-win.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to