Tests: port lib/user tests to single runner

client/lib/people/test/log-store.js

@@ -5,7 +5,7 @@ var assert = require( 'chai' ).assert;
 
 var site = require( './lib/mock-site' ),
 	actions = require( './lib/mock-actions' ),
-	userActions = require( 'lib/users/test/lib/mock-actions' );
+	userActions = require( 'lib/users/test/fixtures/actions' );
 
 require( 'lib/react-test-env-setup' )();
 

client/lib/user-settings/test/index.js

@@ -1,19 +1,32 @@
 /**
  * External dependencies
  */
-var assert = require( 'chai' ).assert;
+import { assert } from 'chai';
 
 /**
  * Internal dependencies
  */
-var userSettings = require( '../index.js' );
+import useFakeDom from 'test/helpers/use-fake-dom';
+import useMockery from 'test/helpers/use-mockery';
+import wpMock from './mocks/wp';
+import userUtilsMock from './mocks/user-utils';
 
-describe( 'User Settings', function() {
-	before( function() {
+describe( 'User Settings', () => {
+	let userSettings;
+
+	useMockery( mockery => {
+		mockery.registerMock( 'lib/wp', wpMock );
+		mockery.registerMock( 'lib/user/utils', userUtilsMock );
+	} );
+
+	useFakeDom();
+
+	before( () => {
+		userSettings = require( '..' );
 		userSettings.fetchSettings();
 	} );
 
-	it( 'should consider overridden settings as saved', function( done ) {
+	it( 'should consider overridden settings as saved', done => {
 		assert.isTrue( userSettings.updateSetting( 'test', true ) );
 		assert.isTrue( userSettings.updateSetting( 'lang_id', true ) );
 
@@ -25,7 +38,6 @@ describe( 'User Settings', function() {
 		function assertCorrectSettingIsRemoved() {
 			assert.isUndefined( userSettings.unsavedSettings.test );
 			assert.isTrue( userSettings.unsavedSettings.lang_id );
-
 			done();
 		}
 	} );

client/lib/user-settings/test/mocks/user-utils.js

@@ -0,0 +1,5 @@
+export default {
+	isLoggedIn() {
+		return true;
+	}
+};

client/lib/user-settings/test/mocks/wp.js

@@ -0,0 +1,25 @@
+const me = function() {
+	return {
+		get() {},
+		settings() {
+			return {
+				get( callback ) {
+					callback( false, {
+						test: false,
+						lang_id: false
+					} );
+				},
+				update( settings, callback ) {
+					setTimeout( () => callback( null, settings ) );
+				}
+			};
+		}
+	};
+}
+
+export default {
+	me,
+	undocumented() {
+		return { me };
+	}
+};

client/lib/user/test/utils.js

@@ -1,97 +1,69 @@
-/* eslint-disable vars-on-top */
-require( 'lib/react-test-env-setup' )();
-
 /**
  * External dependencies
  */
-
-var expect = require( 'chai' ).expect,
-	mockery = require( 'mockery' ),
-	sinon = require( 'sinon' );
+import { expect } from 'chai';
+import sinon from 'sinon';
 
 /**
  * Internal dependencies
  */
+import useMockery from 'test/helpers/use-mockery';
+import useFakeDom from 'test/helpers/use-fake-dom';
 
-const LOGOUT_WITH_DOMAIN = '/url-with-|subdomain|';
-const LOGOUT_WITHOUT_DOMAIN = '/url-without-domain';
-
-describe( 'UserUtils', function() {
-	var user, UserUtils;
-	var logout_URL;
-	var always_use_logout_url = false;
-	var mockedConfig = function() {
-		return logout_URL;
-	};
-	mockedConfig.isEnabled = function( feature ) {
-		if ( feature === 'desktop' ) {
-			return false;
-		}
-
-		if ( feature === 'always_use_logout_url' ) {
-			return always_use_logout_url;
-		}
-
-		return true;
-	};
+describe( 'UserUtils', () => {
+	let UserUtils, user, configMock;
 
-	this.timeout( 10 * 1000 );
+	useFakeDom();
 
-	beforeEach( function() {
-		mockery.enable( {
-			warnOnReplace: false,
-			warnOnUnregistered: false
-		} );
-
-		mockery.registerMock( 'config', mockedConfig );
+	useMockery( mockery => {
+		configMock = sinon.stub();
+		configMock.isEnabled = sinon.stub();
+		mockery.registerMock( 'config', configMock );
+	} );
 
+	before( () => {
 		user = require( 'lib/user' )();
 		UserUtils = require( '../utils' );
 	} );
 
-	afterEach( function() {
-		mockery.disable();
-		mockery.deregisterMock( 'config' );
+	beforeEach( () => {
+		configMock.returns( '/url-with-|subdomain|' );
 	} );
 
-	it( 'uses userData.logout_URL when available', function() {
-		sinon.stub( user, 'get', function() {
-			return {
-				logout_URL: '/userdata'
-			};
+	context( 'without logout url', () => {
+		before( () => {
+			configMock.isEnabled
+				.withArgs( 'always_use_logout_url' )
+				.returns( false );
 		} );
 
-		always_use_logout_url = false;
-		logout_URL = LOGOUT_WITH_DOMAIN;
-		expect( UserUtils.getLogoutUrl() ).to.be.equals( '/userdata' );
-
-		user.get.restore();
-	} );
-
-	it( 'works when |subdomain| is not present', function() {
-		always_use_logout_url = true;
-		logout_URL = LOGOUT_WITHOUT_DOMAIN;
-		expect( UserUtils.getLogoutUrl() ).to.be.equals( '/url-without-domain' );
+		it( 'uses userData.logout_URL when available', () => {
+			sinon.stub( user, 'get' ).returns( { logout_URL: '/userdata' } );
+			expect( UserUtils.getLogoutUrl() ).to.equal( '/userdata' );
+			user.get.restore();
+		} );
 	} );
 
-	it( 'replaces |subdomain| when present and have domain', function() {
-		sinon.stub( user, 'get', function() {
-			return {
-				localeSlug: 'es'
-			};
+	context( 'with logout url', () => {
+		before( () => {
+			configMock.isEnabled
+				.withArgs( 'always_use_logout_url' )
+				.returns( true );
 		} );
 
-		always_use_logout_url = true;
-		logout_URL = LOGOUT_WITH_DOMAIN;
-		expect( UserUtils.getLogoutUrl() ).to.be.equals( '/url-with-es.' );
-
-		user.get.restore();
-	} );
+		it( 'works when |subdomain| is not present', () => {
+			configMock.returns( '/url-without-domain' );
+			expect( UserUtils.getLogoutUrl() ).to.equal( '/url-without-domain' );
+		} );
 
-	it( 'replaces |subdomain| when present but no domain', function() {
-		always_use_logout_url = true;
-		logout_URL = LOGOUT_WITH_DOMAIN;
+		it( 'replaces |subdomain| when present and have domain', () => {
+			sinon.stub( user, 'get' ).returns( { localeSlug: 'es' } );
+			expect( UserUtils.getLogoutUrl() ).to.equal( '/url-with-es.' );
+			user.get.restore();
+		} );
 
-		expect( UserUtils.getLogoutUrl() ).to.be.equals( '/url-with-' );
+		it( 'replaces |subdomain| when present but no domain', () => {
+			expect( UserUtils.getLogoutUrl() ).to.equal( '/url-with-' );
+		} );
 	} );
 } );

client/lib/users/test/lib/mock-actions.js → client/lib/users/test/fixtures/actions.js

@@ -1,10 +1,10 @@
-var site = require( './mock-site' ),
-	usersData = require( './mock-users-data' ),
-	moreUsersData = require( './mock-more-users-data' ),
-	deletedUserData = require( './mock-deleted-user-data' ),
-	updatedUserData = require( './mock-updated-single-user' ),
-	singleUserData = require( './mock-single-user' ),
-	pollingUsersData = require( './mock-polling-users-data' );
+const site = require( './site' ),
+	usersData = require( './users' ),
+	moreUsersData = require( './more-users' ),
+	deletedUserData = require( './deleted-user' ),
+	updatedUserData = require( './updated-single-user' ),
+	singleUserData = require( './single-user' ),
+	pollingUsersData = require( './polling-users' );
 
 module.exports = {
 	fetched: {

client/lib/users/test/lib/mock-polling-users-data.js → client/lib/users/test/fixtures/polling-users.js

@@ -6,8 +6,8 @@ import cloneDeep from 'lodash/cloneDeep';
 /**
  * Internal dependencies
  */
-import usersData from './mock-users-data';
-import moreUsersData from './mock-more-users-data';
+import usersData from './users';
+import moreUsersData from './more-users';
 
 const clonedMoreUsers = cloneDeep( moreUsersData.users );
 const updatedUsers = clonedMoreUsers.map( ( user ) => {