From f54f92402c7daf118e168d72f4aa53015d1a2819 Mon Sep 17 00:00:00 2001
From: Sam Smith <me@samsmith.io>
Date: Wed, 1 Mar 2017 10:36:59 +0000
Subject: [PATCH] storage: Fix UserSettings#hasIsEnabled

mw.storage#get doesn't take a default value to return if the underlying
storage is disabled or the key is missing. In the former case it'll
return false and in the latter it'll return null, i.e. in neither case
will it return undefined.

Bug: T157700
Change-Id: I3f653c11468e17b64765e85ebb3b8f03e311352a
---
 resources/dist/index.js                     | Bin 122213 -> 122234 bytes
 resources/dist/index.js.map                 | Bin 154029 -> 154059 bytes
 src/userSettings.js                         |   4 ++-
 tests/qunit/ext.popups/userSettings.test.js |  26 ++++++++++++++------
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/resources/dist/index.js b/resources/dist/index.js
index b3f1e27de26531124ab539f3a2e9154c74d0d1e3..b4df3d24675395a1f60a1ff1c87af52c4939ebeb 100644
GIT binary patch
delta 78
zcmaF5i~ZLw_6;W2xyurZ6v`5FN>deVCtF>Y(N@s3=Hley1cIW}lG36)1*iP{oYcfT
c4X7$j1w~t1g|x(+;?(BC>)Q*jGk#$O07|PHlK=n!

delta 63
zcmeyhi~Z>?_6;W2r^iV!vQMtKDlM&}P@0#LnwFWDnxdeoplEB0;7^`=ReZAi71riO
M*S9aa&Uk|r04Zo0%>V!Z

diff --git a/resources/dist/index.js.map b/resources/dist/index.js.map
index e3003a3ea64ae994141084ca9ce793d1f7f344cc..c36b759b0331b5da8e96ba3fd069c7185359dd1a 100644
GIT binary patch
delta 178
zcmZ3xne+5!&It}8i9nEMmYkMiVQ6M<Y@V2Ck!UdaAcx$>A`XMeJQCcK-3{a>Cm2Xg
z=HcO=eA`rDQYhEt2L?V&8E%{P3>RBq)xY^^X2Ol>3(6T;*vk@gN>deVr+Ygw%IGO*
zTF2x8VF?HprIwTy<taGj=jWs*=4mKERB9?H+S)3lCFT^TPIq)+lx?5y#JGLF6BC~}
E0Nl7b*#H0l

delta 126
zcmX@TnRD%C&It}8MrKB4h870N#zy8Q=1GQ0DXC^@lMiypZ7kw2nA~S;J9)1`DU+q^
z<Q`4)&Dn-I7FacGew~?cV|t1Mqms0aLTO$~YFcJqYKnrUf}*W0g5SQtiE;Y^Cnjxi
E07+RXZ2$lO

diff --git a/src/userSettings.js b/src/userSettings.js
index 18166b6a4..d827a91f9 100644
--- a/src/userSettings.js
+++ b/src/userSettings.js
@@ -45,7 +45,9 @@ module.exports = function ( storage ) {
 		 * @return {Boolean}
 		 */
 		hasIsEnabled: function () {
-			return storage.get( IS_ENABLED_KEY, undefined ) !== undefined;
+			var value = storage.get( IS_ENABLED_KEY );
+
+			return Boolean( value ) !== false;
 		},
 
 		/**
diff --git a/tests/qunit/ext.popups/userSettings.test.js b/tests/qunit/ext.popups/userSettings.test.js
index 63c23f743..66b46a660 100644
--- a/tests/qunit/ext.popups/userSettings.test.js
+++ b/tests/qunit/ext.popups/userSettings.test.js
@@ -9,11 +9,7 @@
 		}
 	} );
 
-	QUnit.test( '#getIsEnabled should return true if the storage is empty', 1, function ( assert ) {
-		assert.ok( this.userSettings.getIsEnabled() );
-	} );
-
-	QUnit.test( '#getIsEnabled should return false if Link Previews have been disabled', 2, function ( assert ) {
+	QUnit.test( '#getIsEnabled should return false if Page Previews have been disabled', 2, function ( assert ) {
 		this.userSettings.setIsEnabled( false );
 
 		assert.notOk( this.userSettings.getIsEnabled() );
@@ -28,8 +24,13 @@
 		);
 	} );
 
-	QUnit.test( '#hasIsEnabled', 2, function ( assert ) {
-		assert.notOk( this.userSettings.hasIsEnabled() );
+	QUnit.test( '#hasIsEnabled', 3, function ( assert ) {
+		var getStub;
+
+		assert.notOk(
+			this.userSettings.hasIsEnabled(),
+			'#hasIsEnabled should return false if the storage is empty.'
+		);
 
 		// ---
 
@@ -39,6 +40,17 @@
 			this.userSettings.hasIsEnabled(),
 			'#hasIsEnabled should return true even if "isEnabled" has been set to falsy.'
 		);
+
+		// ---
+
+		getStub = this.sandbox.stub( this.storage, 'get' ).returns( false );
+
+		assert.notOk(
+			this.userSettings.hasIsEnabled(),
+			'#hasIsEnabled should return false if the storage is disabled.'
+		);
+
+		getStub.restore();
 	} );
 
 	QUnit.test( '#getPreviewCount should return the count as a number', function ( assert ) {