Merge pull request #3773 from Automattic/update/redux-single-test-runner

State: Remove subtree Makefiles in favor of single test runner

client/lib/react-test-env-setup/index.js

@@ -35,3 +35,13 @@ module.exports = function( markup, features ) {
 		global.XMLHttpRequest = window.XMLHttpRequest;
 	}
 };
+
+module.exports.cleanup = function() {
+	delete global.document;
+	delete global.window;
+	delete global.navigator;
+	delete global.Element;
+	delete global.history;
+	delete global.localStorage;
+	delete global.XMLHttpRequest;
+};

client/state/Makefile

@@ -5,6 +5,9 @@ BASE_DIR := $(NODE_BIN)/../..
 NODE_PATH := $(BASE_DIR)/client
 
 test:
-	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register,js:babel/register --reporter $(REPORTER)
+	@NODE_ENV=test NODE_PATH=$(NODE_PATH) $(MOCHA) --compilers jsx:babel/register,js:babel/register --reporter $(REPORTER) $(addprefix --grep ,$(GREP))
 
-.PHONY: test
+test-%:
+	@GREP="state $*" make test
+
+.PHONY: test test-%

client/state/comments/test/actions.js

@@ -3,8 +3,7 @@
  */
 import nock from 'nock';
 import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-import Chai, { expect } from 'chai';
+import { expect } from 'chai';
 import Immutable from 'immutable';
 
 /**
@@ -34,8 +33,6 @@ import {
 	NUMBER_OF_COMMENTS_PER_FETCH
 } from '../constants'
 
-Chai.use( sinonChai );
-
 const MANY_COMMENTS_POST = {
 	siteId: 91750058,
 	postId: 287
@@ -44,14 +41,8 @@ const MANY_COMMENTS_POST = {
 const API_DOMAIN = 'https://public-api.wordpress.com:443';
 
 describe( 'actions', () => {
-	before( () => {
-		// make sure all requests are mocked
-		nock.disableNetConnect();
-	} );
-
 	after( () => {
 		nock.cleanAll();
-		nock.enableNetConnect();
 	} );
 
 	describe( '#receivePost()', () => {

client/state/plugins/wporg/test/test-actions.js

@@ -35,6 +35,7 @@ describe( 'WPorg Data Actions', function() {
 	} );
 
 	after( function() {
+		mockery.deregisterAll();
 		mockery.disable();
 	} );
 

client/state/post-types/test/actions.js

@@ -3,8 +3,7 @@
  */
 import nock from 'nock';
 import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-import Chai, { expect } from 'chai';
+import { expect } from 'chai';
 
 /**
  * Internal dependencies
@@ -23,16 +22,12 @@ import {
 describe( 'actions', () => {
 	const spy = sinon.spy();
 
-	before( () => {
-		Chai.use( sinonChai );
-	} );
-
 	beforeEach( () => {
 		spy.reset();
 	} );
 
 	after( () => {
-		nock.restore();
+		nock.cleanAll();
 	} );
 
 	describe( '#receivePostTypes()', () => {
@@ -68,10 +63,6 @@ describe( 'actions', () => {
 				} );
 		} );
 
-		after( () => {
-			nock.cleanAll();
-		} );
-
 		it( 'should dispatch fetch action when thunk triggered', () => {
 			requestPostTypes( 2916284 )( spy );
 

client/state/post-types/test/reducer.js

@@ -1,9 +1,8 @@
 /**
  * External dependencies
  */
-import Chai, { expect } from 'chai';
+import { expect } from 'chai';
 import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
 import deepFreeze from 'deep-freeze';
 
 /**
@@ -21,7 +20,6 @@ import { requesting, items } from '../reducer';
 
 describe( 'reducer', () => {
 	before( () => {
-		Chai.use( sinonChai );
 		sinon.stub( console, 'warn' );
 	} );
 

client/state/posts/test/actions.js

@@ -3,8 +3,7 @@
  */
 import nock from 'nock';
 import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-import Chai, { expect } from 'chai';
+import { expect } from 'chai';
 
 /**
  * Internal dependencies
@@ -31,16 +30,12 @@ import {
 describe( 'actions', () => {
 	const spy = sinon.spy();
 
-	before( () => {
-		Chai.use( sinonChai );
-	} );
-
 	beforeEach( () => {
 		spy.reset();
 	} );
 
 	after( () => {
-		nock.restore();
+		nock.cleanAll();
 	} );
 
 	describe( '#receivePost()', () => {
@@ -92,10 +87,6 @@ describe( 'actions', () => {
 				} );
 		} );
 
-		after( () => {
-			nock.cleanAll();
-		} );
-
 		it( 'should dispatch fetch action when thunk triggered', () => {
 			requestSitePosts( 2916284 )( spy );
 
@@ -173,10 +164,6 @@ describe( 'actions', () => {
 				} );
 		} );
 
-		after( () => {
-			nock.cleanAll();
-		} );
-
 		it( 'should dispatch posts receive action when request completes', () => {
 			return requestPosts()( spy ).then( () => {
 				expect( spy ).to.have.been.calledWith( {
@@ -203,10 +190,6 @@ describe( 'actions', () => {
 				} );
 		} );
 
-		after( () => {
-			nock.cleanAll();
-		} );
-
 		it( 'should dispatch request action when thunk triggered', () => {
 			requestSitePost( 2916284, 413 )( spy );
 

client/state/sharing/publicize/test/actions.js

@@ -3,8 +3,7 @@
  */
 import nock from 'nock';
 import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-import Chai, { expect } from 'chai';
+import { expect } from 'chai';
 
 /**
  * Internal dependencies
@@ -20,11 +19,6 @@ import {
 	failConnectionsRequest
 } from '../actions';
 
-/**
- * Test setup
- */
-Chai.use( sinonChai );
-
 describe( '#fetchConnections()', () => {
 	const spy = sinon.spy();
 
@@ -49,7 +43,7 @@ describe( '#fetchConnections()', () => {
 	} );
 
 	after( () => {
-		nock.restore();
+		nock.cleanAll();
 	} );
 
 	it( 'should dispatch fetch action when thunk triggered', () => {

client/state/site-settings/exporter/test/actions.js

@@ -3,8 +3,7 @@
  */
 import nock from 'nock';
 import sinon from 'sinon';
-import sinonChai from 'sinon-chai';
-import Chai, { expect } from 'chai';
+import { expect } from 'chai';
 
 /**
  * Internal dependencies
@@ -32,11 +31,6 @@ import {
 	SAMPLE_EXPORT_FAILED_RESPONSE,
 } from './sample-data';
 
-/**
- * Test setup
- */
-Chai.use( sinonChai );
-
 describe( 'actions', () => {
 	const spy = sinon.spy();
 	const getState = () => ( {
@@ -63,7 +57,7 @@ describe( 'actions', () => {
 	} );
 
 	after( () => {
-		nock.restore();
+		nock.cleanAll();
 	} );
 
 	describe( '#advancedSettingsFetch()', () => {