Merge pull request #4132 from Automattic/update/components-single-tes…

…t-runner Update: Move some components to single test runner
Automattic · Mar 18, 2016 · 4ccdb6f · 4ccdb6f
2 parents 7412894 + 3591eec
commit 4ccdb6f
Show file tree

Hide file tree

Showing 18 changed files with 60 additions and 125 deletions.
diff --git a/client/components/accordion/Makefile b/client/components/accordion/Makefile
diff --git a/client/components/accordion/test/index.jsx b/client/components/accordion/test/index.jsx
@@ -1,6 +1,3 @@
-/* eslint-disable vars-on-top */
-require( 'lib/react-test-env-setup' )();
-
 /**
  * External dependencies
  */
@@ -9,14 +6,15 @@ var expect = require( 'chai' ).expect,
 	React = require( 'react' ),
 	TestUtils = require( 'react-addons-test-utils' );
 
-require( 'react-tap-event-plugin' )();
-
 /**
  * Internal dependencies
  */
 var Accordion = require( '../' );
 
-describe( 'Accordion', function() {
+describe( 'index', function() {
+	require( 'react-tap-event-plugin' )();
+	require( 'test/helpers/use-fake-dom' )();
+
 	afterEach( function() {
 		ReactDom.unmountComponentAtNode( document.body );
 	} );

diff --git a/client/components/bulk-select/Makefile b/client/components/bulk-select/Makefile
diff --git a/client/components/bulk-select/test/index.js b/client/components/bulk-select/test/index.js
@@ -1,6 +1,3 @@
-
-require( 'lib/react-test-env-setup' )();
-
 /**
  * External dependencies
  */
@@ -14,7 +11,8 @@ import noop from 'lodash/noop';
  */
 import BulkSelect from '../index';
 
-describe( 'BulkSelect', function() {
+describe( 'index', function() {
+	require( 'test/helpers/use-fake-dom' )();
 	it( 'should have BulkSelect class', function() {
 		const bulkSelect = shallow( <BulkSelect selectedElements={ 0 } totalElements={ 3 } onToggle={ noop } /> );
 		assert.equal( 1, bulkSelect.find( '.bulk-select' ).length );

diff --git a/client/components/data/media-list-data/Makefile b/client/components/data/media-list-data/Makefile
diff --git a/client/components/data/media-list-data/test/index.js b/client/components/data/media-list-data/test/index.js
diff --git a/.../data/media-list-data/test/specs/utils.js → ...onents/data/media-list-data/test/utils.js b/.../data/media-list-data/test/specs/utils.js → ...onents/data/media-list-data/test/utils.js
@@ -6,7 +6,7 @@ var expect = require( 'chai' ).expect;
 /**
  * Internal dependencies
  */
-var utils = require( '../../utils' );
+var utils = require( '../utils' );
 
 describe( 'utils', function() {
 	describe( '#getMimeBaseTypeFromFilter()', function() {

diff --git a/client/components/drop-zone/Makefile b/client/components/drop-zone/Makefile
diff --git a/client/components/drop-zone/test/index.jsx b/client/components/drop-zone/test/index.jsx
@@ -1,31 +1,18 @@
-/* eslint-disable vars-on-top */
-require( 'lib/react-test-env-setup' )( '<html><body><div id="container"></div></body></html>' );
-
-/**
- * External dependencies
- */
 var expect = require( 'chai' ).expect,
 	ReactDom = require( 'react-dom' ),
 	React = require( 'react' ),
 	TestUtils = require( 'react-addons-test-utils' ),
-	sinon = require( 'sinon' );
-
-/**
- * Internal dependencies
- */
-var DropZone = require( '../' );
-
-/**
- * Module variables
- */
-var Wrapper = React.createClass( {
-	render: function() {
-		return <div>{ this.props.children }</div>;
-	}
-} );
+	sinon = require( 'sinon' ),
+	DropZone = require( '../' ),
+	Wrapper = React.createClass( {
+		render: function() {
+			return <div>{ this.props.children }</div>;
+		}
+	} );
 
-describe( 'DropZone', function() {
+describe( 'index', function() {
 	var container, sandbox;
+	require( 'test/helpers/use-fake-dom' )( '<html><body><div id="container"></div></body></html>' );
 
 	before( function() {
 		DropZone.prototype.__reactAutoBindMap.translate = sinon.stub().returnsArg( 0 );
@@ -37,7 +24,9 @@ describe( 'DropZone', function() {
 	} );
 
 	after( function() {
-		delete window.MutationObserver;
+		if ( global.window && global.window.MutationObserver ) {
+			delete global.window.MutationObserver;
+		}
 		delete DropZone.prototype.__reactAutoBindMap.translate;
 	} );
 

diff --git a/client/components/forms/counted-textarea/Makefile b/client/components/forms/counted-textarea/Makefile
diff --git a/client/components/forms/counted-textarea/test/index.jsx b/client/components/forms/counted-textarea/test/index.jsx
@@ -11,7 +11,7 @@ var React = require( 'react' ),
  */
 var i18n = require( 'lib/mixins/i18n' );
 
-describe( 'CountedTextarea', function() {
+describe( 'index', function() {
 	var CountedTextarea, renderer;
 
 	before( function() {

diff --git a/client/components/forms/form-toggle/Makefile b/client/components/forms/form-toggle/Makefile
diff --git a/client/components/forms/form-toggle/test/index.jsx b/client/components/forms/form-toggle/test/index.jsx
@@ -18,13 +18,12 @@ var FormToggle = require( 'components/forms/form-toggle' ),
  */
 var Wrapper = React.createClass( {
 	render: function() {
-		return <div>{this.props.children}</div>;
+		return <div>{ this.props.children }</div>;
 	}
 } );
 
-require( 'lib/react-test-env-setup' )();
-
-describe( 'CompactFormToggle', function() {
+describe( 'index', function() {
+	require( 'test/helpers/use-fake-dom' )();
 	describe( 'rendering', function() {
 		it( 'should have is-compact class', function() {
 			var toggle = TestUtils.renderIntoDocument( <CompactFormToggle /> ),
@@ -37,6 +36,7 @@ describe( 'CompactFormToggle', function() {
 } );
 
 describe( 'FormToggle', function() {
+	require( 'test/helpers/use-fake-dom' )();
 	afterEach( function() {
 		ReactDom.unmountComponentAtNode( document.body );
 	} );

diff --git a/client/components/forms/multi-checkbox/Makefile b/client/components/forms/multi-checkbox/Makefile
diff --git a/client/components/forms/multi-checkbox/test/index.jsx b/client/components/forms/multi-checkbox/test/index.jsx
@@ -1,23 +1,15 @@
-require( 'lib/react-test-env-setup' )();
-
-/**
- * External dependencies
- */
 var assert = require( 'assert' ),
 	ReactDom = require( 'react-dom' ),
 	React = require( 'react' ),
-	TestUtils = require( 'react-addons-test-utils' );
-
-/**
- * Internal dependencies
- */
-var MultiCheckbox = require( '../' );
+	TestUtils = require( 'react-addons-test-utils' ),
+	MultiCheckbox = require( '../' );
 
-describe( 'MultiCheckbox', function() {
+describe( 'index', function() {
 	var options = [
 		{ value: 1, label: 'One' },
 		{ value: 2, label: 'Two' }
 	];
+	require( 'test/helpers/use-fake-dom' )();
 
 	afterEach( function() {
 		ReactDom.unmountComponentAtNode( document.body );

diff --git a/client/components/forms/range/Makefile b/client/components/forms/range/Makefile
diff --git a/client/components/forms/range/test/index.jsx b/client/components/forms/range/test/index.jsx
@@ -1,5 +1,3 @@
-require( 'lib/react-test-env-setup' )();
-
 /**
  * External dependencies
  */
@@ -13,7 +11,8 @@ var expect = require( 'chai' ).expect,
  */
 var FormRange = require( '../' );
 
-describe( 'Range', function() {
+describe( 'index', function() {
+	require( 'test/helpers/use-fake-dom' )();
 	afterEach( function() {
 		ReactDom.unmountComponentAtNode( document.body );
 	} );
@@ -28,7 +27,7 @@ describe( 'Range', function() {
 			content = TestUtils.scryRenderedDOMComponentsWithClass( range, 'range__content' );
 
 		expect( content ).to.have.length( 1 );
-		expect( content[0].props.className ).to.contain( 'is-min' );
+		expect( content[0].getAttribute( 'class' ) ).to.contain( 'is-min' );
 	} );
 
 	it( 'should render ending content if passed a `maxContent` prop', function() {
@@ -41,7 +40,7 @@ describe( 'Range', function() {
 			content = TestUtils.scryRenderedDOMComponentsWithClass( range, 'range__content' );
 
 		expect( content ).to.have.length( 1 );
-		expect( content[0].props.className ).to.contain( 'is-max' );
+		expect( content[0].getAttribute( 'class' ) ).to.contain( 'is-max' );
 	} );
 
 	it( 'should render a value label if passed a truthy `showValueLabel` prop', function() {

diff --git a/client/tests.json b/client/tests.json
@@ -7,6 +7,34 @@
 			"domain-suggestion": {
 				"test": [ "index" ]
 			}
+		},
+		"accordion": {
+			"test": [ "index" ]
+		},
+		"bulk-select": {
+			"test": [ "index" ]
+		},
+		"data": {
+			"media-list-data": {
+				"test": [ "utils" ]
+			}
+		},
+		"drop-zone": {
+			"test": [ "index" ]
+		},
+		"forms": {
+			"counted-textarea": {
+				"test": [ "index" ]
+			},
+			"form-toggle": {
+				"test": [ "index" ]
+			},
+			"multi-checkbox": {
+				"test": [ "index" ]
+			},
+			"range": {
+				"test": [ "index" ]
+			}
 		}
 	},
 	"lib": {