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

Update Suspense usage #2099

Merged
merged 14 commits into from
Sep 15, 2020
Merged

Update Suspense usage #2099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
fcf0522
wip: save
yyx990803 Sep 8, 2020
dff993c
wip: save
yyx990803 Sep 9, 2020
cab46c8
wip: hoc els
yyx990803 Sep 9, 2020
d567139
wip: unmount fallback
yyx990803 Sep 9, 2020
7f6a5d3
wip: new suspense hydration
yyx990803 Sep 10, 2020
e0d1e44
wip: transition + out-in
yyx990803 Sep 10, 2020
b6b02a6
wip: pass existing tests
yyx990803 Sep 11, 2020
e416b8e
wip: work with keep-alive
yyx990803 Sep 11, 2020
b04d858
wip: fix suspense patch el inheritance
yyx990803 Sep 11, 2020
0e0500e
test: tests for new suspense behaviors
yyx990803 Sep 11, 2020
2812bf6
test: test transition out-in mode + suspense
yyx990803 Sep 11, 2020
af9fa2d
chore: warn multi root suspense
yyx990803 Sep 11, 2020
ef63762
chore: fix dts test
yyx990803 Sep 11, 2020
3e6aaa6
chore: increase markdown spec test debounce
yyx990803 Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions packages/runtime-core/__tests__/apiAsyncComponent.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,7 @@ describe('api: defineAsyncComponent', () => {
const app = createApp({
render: () =>
h(Suspense, null, {
default: () => [h(Foo), ' & ', h(Foo)],
default: () => h('div', [h(Foo), ' & ', h(Foo)]),
fallback: () => 'loading'
})
})
Expand All @@ -416,7 +416,7 @@ describe('api: defineAsyncComponent', () => {

resolve!(() => 'resolved')
await timeout()
expect(serializeInner(root)).toBe('resolved & resolved')
expect(serializeInner(root)).toBe('<div>resolved & resolved</div>')
})

test('suspensible: false', async () => {
Expand All @@ -433,18 +433,18 @@ describe('api: defineAsyncComponent', () => {
const app = createApp({
render: () =>
h(Suspense, null, {
default: () => [h(Foo), ' & ', h(Foo)],
default: () => h('div', [h(Foo), ' & ', h(Foo)]),
fallback: () => 'loading'
})
})

app.mount(root)
// should not show suspense fallback
expect(serializeInner(root)).toBe('<!----> & <!---->')
expect(serializeInner(root)).toBe('<div><!----> & <!----></div>')

resolve!(() => 'resolved')
await timeout()
expect(serializeInner(root)).toBe('resolved & resolved')
expect(serializeInner(root)).toBe('<div>resolved & resolved</div>')
})

test('suspense with error handling', async () => {
Expand All @@ -460,7 +460,7 @@ describe('api: defineAsyncComponent', () => {
const app = createApp({
render: () =>
h(Suspense, null, {
default: () => [h(Foo), ' & ', h(Foo)],
default: () => h('div', [h(Foo), ' & ', h(Foo)]),
fallback: () => 'loading'
})
})
Expand All @@ -472,7 +472,7 @@ describe('api: defineAsyncComponent', () => {
reject!(new Error('no'))
await timeout()
expect(handler).toHaveBeenCalled()
expect(serializeInner(root)).toBe('<!----> & <!---->')
expect(serializeInner(root)).toBe('<div><!----> & <!----></div>')
})

test('retry (success)', async () => {
Expand Down
Loading