Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

act() - s / flushPassiveEffects / Scheduler.unstable_flushWithoutYielding #15591

Merged
merged 17 commits into from May 16, 2019
Merged

act() - s / flushPassiveEffects / Scheduler.unstable_flushWithoutYielding #15591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0f1977a
s/flushPassiveEffects/unstable_flushWithoutYielding
May 8, 2019
5e5a68b
ugh lint
May 8, 2019
37989a5
pass build, flushPassiveEffects returns nothing now
May 8, 2019
f5fd513
pass test-fire
May 9, 2019
5003233
flush all work (not just effects), add a compatibility mode
May 9, 2019
7de2164
umd build for scheduler/unstable_mock, pass the fixture with it
May 9, 2019
0287733
add a comment to Shcduler.umd.js for why we're exporting unstable_flu…
May 9, 2019
3966dcc
run testsutilsact tests in both sync/concurrent modes
May 11, 2019
9f2d141
augh lint
May 11, 2019
6920e9f
use a feature flag for the missing mock scheduler warning
May 11, 2019
690f83e
Update ReactTestUtilsAct-test.js
May 15, 2019
8198a82
Merge remote-tracking branch 'origin/master' into act-flushall
May 15, 2019
53b91d2
pass failing tests in batchedmode-test
May 15, 2019
12a143a
fix pretty/lint/import errors
May 16, 2019
d6e43e7
pass test-build
May 16, 2019
47e1eed
nit: pull .create(null) out of the act() call
May 16, 2019
763c03e
Merge remote-tracking branch 'origin/master' into act-flushall
May 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions fixtures/dom/.gitignore
View file
Open in desktop
Expand Up @@ -8,6 +8,8 @@ coverage

# production
build
public/scheduler-unstable_mock.development.js
public/scheduler-unstable_mock.production.min.js
public/react.development.js
public/react.production.min.js
public/react-dom.development.js
Expand Down
2 changes: 1 addition & 1 deletion fixtures/dom/package.json
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@
},
"scripts": {
"start": "react-scripts start",
"prestart": "cp ../../build/node_modules/react/umd/react.development.js ../../build/node_modules/react-dom/umd/react-dom.development.js ../../build/node_modules/react/umd/react.production.min.js ../../build/node_modules/react-dom/umd/react-dom.production.min.js ../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js ../../build/node_modules/react-dom/umd/react-dom-server.browser.production.min.js ../../build/node_modules/react-dom/umd/react-dom-test-utils.development.js ../../build/node_modules/react-dom/umd/react-dom-test-utils.production.min.js public/",
"prestart": "cp ../../build/node_modules/scheduler/umd/scheduler-unstable_mock.development.js ../../build/node_modules/scheduler/umd/scheduler-unstable_mock.production.min.js ../../build/node_modules/react/umd/react.development.js ../../build/node_modules/react-dom/umd/react-dom.development.js ../../build/node_modules/react/umd/react.production.min.js ../../build/node_modules/react-dom/umd/react-dom.production.min.js ../../build/node_modules/react-dom/umd/react-dom-server.browser.development.js ../../build/node_modules/react-dom/umd/react-dom-server.browser.production.min.js ../../build/node_modules/react-dom/umd/react-dom-test-utils.development.js ../../build/node_modules/react-dom/umd/react-dom-test-utils.production.min.js public/",
"build": "react-scripts build && cp build/index.html build/200.html",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
Expand Down
4 changes: 4 additions & 0 deletions fixtures/dom/public/act-dom.html
View file
Open in desktop
Expand Up @@ -7,7 +7,11 @@
this page tests whether act runs properly in a browser.
<br/>
your console should say "5"
<script src='scheduler-unstable_mock.development.js'></script>
<script src='react.development.js'></script>
<script type="text/javascript">
window.React.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.Scheduler = window.SchedulerMock
</script>
<script src='react-dom.development.js'></script>
<script src='react-dom-test-utils.development.js'></script>
<script>
Expand Down
28 changes: 28 additions & 0 deletions packages/react-dom/src/__tests__/ReactTestUtilsAct-test.internal.js
View file
Open in desktop
@@ -0,0 +1,28 @@
/**
* Copyright (c) Facebook, Inc. and its affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*
* @emails react-core
*/

let ReactFeatureFlags;
let act;
describe('mocked scheduler', () => {
beforeEach(() => {
jest.resetModules();
ReactFeatureFlags = require('shared/ReactFeatureFlags');
ReactFeatureFlags.warnAboutMissingMockScheduler = true;
jest.unmock('scheduler');
act = require('react-dom/test-utils').act;
});
it("should warn when the scheduler isn't mocked", () => {
expect(() => act(() => {})).toWarnDev(
[
'Starting from React v17, the "scheduler" module will need to be mocked',
],
{withoutStack: true},
);
});
});