wip: trying to make tests work

This commit is contained in:
Evan You
2018-11-02 07:43:28 +09:00
parent d70b7d6dd5
commit ba571cda61
7 changed files with 53 additions and 45 deletions

View File

@@ -16,14 +16,14 @@ import {
} from '@vue/runtime-test'
describe('Fragments', () => {
it('should allow returning multiple component root nodes', () => {
it('should allow returning multiple component root nodes', async () => {
class App extends Component {
render() {
return [h('div', 'one'), 'two']
}
}
const root = nodeOps.createElement('div')
render(h(App), root)
await render(h(App), root)
expect(serialize(root)).toBe(`<div><div>one</div>two</div>`)
expect(root.children.length).toBe(2)
expect(root.children[0]).toMatchObject({
@@ -40,14 +40,14 @@ describe('Fragments', () => {
})
})
it('should be able to explicitly create fragments', () => {
it('should be able to explicitly create fragments', async () => {
class App extends Component {
render() {
return h('div', [h(Fragment, [h('div', 'one'), 'two'])])
}
}
const root = nodeOps.createElement('div')
render(h(App), root)
await render(h(App), root)
const parent = root.children[0] as TestElement
expect(serialize(parent)).toBe(`<div><div>one</div>two</div>`)
})
@@ -65,7 +65,7 @@ describe('Fragments', () => {
}
}
const root = nodeOps.createElement('div')
render(h(App), root)
await render(h(App), root)
expect(serialize(root)).toBe(`<div><div>one</div>two</div>`)
@@ -84,7 +84,7 @@ describe('Fragments', () => {
}
}
const root = nodeOps.createElement('div')
render(h(App), root)
await await render(h(App), root)
expect(serialize(root)).toBe(`<div><div>one</div>two</div>`)
@@ -103,7 +103,7 @@ describe('Fragments', () => {
}
}
const root = nodeOps.createElement('div')
render(h(App), root)
await render(h(App), root)
expect(serialize(root)).toBe(`<div><div>one</div><div>two</div></div>`)
@@ -138,7 +138,7 @@ describe('Fragments', () => {
}
}
const root = nodeOps.createElement('div')
render(h(App), root)
await render(h(App), root)
const parent = root.children[0] as TestElement
expect(serialize(parent)).toBe(
@@ -179,7 +179,7 @@ describe('Fragments', () => {
}
const root = nodeOps.createElement('div')
render(h(App), root)
await render(h(App), root)
expect(serialize(root)).toBe(
`<div><div>outer</div><div>one</div><div>two</div></div>`

View File

@@ -109,7 +109,8 @@ export interface ComponentInstance<P = {}, D = {}>
// actual implementation of the component
class InternalComponent implements PublicInstanceMethods {
get $el(): any {
return this.$vnode && this.$vnode.el
const el = this.$vnode && this.$vnode.el
return typeof el === 'function' ? (el as any)() : el
}
$vnode: VNode | null = null

View File

@@ -228,13 +228,9 @@ export function createRenderer(options: RendererOptions) {
// kept-alive
activateComponentInstance(vnode, container, endNode)
} else {
if (__JSDOM__) {
queueJob(() => {
mountComponentInstance(vnode, container, isSVG, endNode)
} else {
queueJob(() => {
mountComponentInstance(vnode, container, isSVG, endNode)
}, flushHooks)
}
}, flushHooks)
}
}
@@ -1441,7 +1437,6 @@ export function createRenderer(options: RendererOptions) {
}
}
return nextTick(() => {
debugger
return vnode && vnode.flags & VNodeFlags.COMPONENT_STATEFUL
? (vnode.children as ComponentInstance).$proxy
: null