Merge branch 'master' into delete-debugging-props

preactjs · Jun 9, 2019 · 26a35f6 · 26a35f6
2 parents 36deb54 + f90baf9
commit 26a35f6
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/test-utils/src/index.js b/test-utils/src/index.js
@@ -36,6 +36,7 @@ export function act(cb) {
 		rerender();
 	}
 
+	teardown();
 	options.requestAnimationFrame = previousRequestAnimationFrame;
 }
 
@@ -53,4 +54,7 @@ export function teardown() {
 		options.debounceRendering = options.__test__previousDebounce;
 		delete options.__test__previousDebounce;
 	}
+	else {
+		options.debounceRendering = undefined;
+	}
 }
diff --git a/test-utils/test/shared/act.test.js b/test-utils/test/shared/act.test.js
@@ -16,6 +16,7 @@ describe('act', () => {
 
 	afterEach(() => {
 		teardown(scratch);
+		options.debounceRendering = undefined;
 	});
 
 	it('should reset options after act finishes', () => {
@@ -127,4 +128,19 @@ describe('act', () => {
 		expect(options.requestAnimationFrame).to.equal(spy);
 		expect(spy).to.not.be.called;
 	});
+
+	it('should restore options.debounceRendering', () => {
+		const spy = sinon.spy();
+
+		options.debounceRendering = spy;
+		act(() => null);
+
+		expect(options.debounceRendering).to.equal(spy);
+		expect(spy).to.not.be.called;
+	});
+
+	it('should restore options.debounceRendering when it was undefined before', () => {
+		act(() => null);
+		expect(options.debounceRendering).to.equal(undefined);
+	});
 });