Merge branch 'master' into prevent-demo-postinstall

test/browser/customBuiltInElements.test.js

@@ -3,7 +3,9 @@ import { setupScratch, teardown } from '../_util/helpers';
 
 /** @jsx createElement */
 
-describe('customised built-in elements', () => {
+const runSuite = typeof customElements === 'undefined' ? xdescribe : describe;
+
+runSuite('customised built-in elements', () => {
 	let scratch;
 
 	beforeEach(() => {
@@ -16,10 +18,6 @@ describe('customised built-in elements', () => {
 
 	it('should create built in elements correctly', () => {
 		class Foo extends Component {
-			constructor(props) {
-				super(props);
-				return true;
-			}
 			render() {
 				return <div is="built-in" />;
 			}

test/shared/createElement.test.js

@@ -157,6 +157,25 @@ describe('createElement(jsx)', () => {
 			.that.equals('textstuff');
 	});
 
+	it('should NOT set children prop when null', () => {
+		let r = h('foo', {foo : 'bar'}, null);
+
+		expect(r)
+			.to.be.an('object')
+			.to.have.nested.property('props.foo')
+			.not.to.have.nested.property('props.children')
+
+	})
+
+	it('should NOT set children prop when unspecified', () => {
+		let r = h('foo', {foo : 'bar'});
+
+		expect(r)
+			.to.be.an('object')
+			.to.have.nested.property('props.foo')
+			.not.to.have.nested.property('props.children')
+	})
+
 	it('should NOT merge adjacent text children', () => {
 		let r = h(
 			'foo',
@@ -214,6 +233,7 @@ describe('createElement(jsx)', () => {
 				null
 			]);
 	});
+
 	it('should not merge children that are boolean values', () => {
 		let r = h('foo', null, 'one', true, 'two', false, 'three');