Skip to content

Commit 03c13de

Browse files
committed
refactor: remove unncessary condition
1 parent ed34113 commit 03c13de

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

src/core/vdom/helpers/resolve-async-component.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ export function resolveAsyncComponent (
6565
if (!isDef(factory.owners)) {
6666
const owners = factory.owners = [owner]
6767
let sync = true
68-
69-
if (owner) owner.$on('hook:destroyed', () => remove(owners, owner))
68+
69+
;(owner: any).$on('hook:destroyed', () => remove(owners, owner))
7070

7171
const forceRender = (renderCompleted: boolean) => {
7272
for (let i = 0, l = owners.length; i < l; i++) {

test/unit/modules/vdom/create-component.spec.js

+6
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,9 @@ describe('create-component', () => {
9393
props: ['msg']
9494
})
9595
}
96+
setCurrentRenderingInstance(vm)
9697
const vnode = createComponent(async, data, vm, vm)
98+
setCurrentRenderingInstance(null)
9799
expect(vnode.asyncFactory).toBe(async)
98100
expect(vnode.asyncFactory.owners.length).toEqual(0)
99101
expect(vnode.tag).toMatch(/vue-component-[0-9]+-child/)
@@ -121,11 +123,15 @@ describe('create-component', () => {
121123
}, 0)
122124
}
123125
function go () {
126+
setCurrentRenderingInstance(vm)
124127
vnode = createComponent(async, data, vm, vm)
128+
setCurrentRenderingInstance(null)
125129
expect(vnode.isComment).toBe(true) // not to be loaded yet.
126130
}
127131
function failed () {
132+
setCurrentRenderingInstance(vm)
128133
vnode = createComponent(async, data, vm, vm)
134+
setCurrentRenderingInstance(null)
129135
expect(vnode.isComment).toBe(true) // failed, still a comment node
130136
expect(`Failed to resolve async component: ${async}\nReason: ${reason}`).toHaveBeenWarned()
131137
done()

0 commit comments

Comments
 (0)