Merge 3c17e3e into 73866a4

src/render-queue.js

@@ -20,9 +20,8 @@ export function enqueueRender(component) {
 
 /** Rerender all enqueued dirty components */
 export function rerender() {
-	let p, list = items;
-	items = [];
-	while ( (p = list.pop()) ) {
+	let p;
+	while ( (p = items.pop()) ) {
 		if (p._dirty) renderComponent(p);
 	}
 }

test/browser/lifecycle.js

@@ -1440,6 +1440,25 @@ describe('Lifecycle methods', () => {
 
 
 	describe('Lifecycle DOM Timing', () => {
+		it('should render in a single microtask', () => {
+			class Counter extends Component {
+				constructor() {
+					super();
+					this.state = { count: 0 };
+				}
+				render(props, { count }) {
+					if (count < 2) {
+						this.setState({ count: count + 1 });
+					}
+					return count;
+				}
+			}
+			render(<Counter />, scratch);
+			rerender();
+			expect(scratch.textContent).to.equal("2");
+			rerender();
+		});
+
 		it('should be invoked when dom does (DidMount, WillUnmount) or does not (WillMount, DidUnmount) exist', () => {
 			let setState;
 			class Outer extends Component {