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

fix: stub dynamic components #1051

Merged
merged 3 commits into from Dec 1, 2018
Merged

fix: stub dynamic components #1051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ee0739
fix: stub component options object
eddyerburgh Nov 30, 2018
18ffe15
refactor: move function
eddyerburgh Nov 30, 2018
46ed468
refactor: break assertion into multiple lines
eddyerburgh Nov 30, 2018
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
12 changes: 9 additions & 3 deletions packages/create-instance/patch-render.js
View file
Open in desktop
Expand Up @@ -50,6 +50,10 @@ function isConstructor (el) {
return typeof el === 'function'
}

function isComponentOptions (el) {
return typeof el === 'object' && (el.template || el.render)
}

export function patchRender (_Vue, stubs, stubAllComponents) {
// This mixin patches vm.$createElement so that we can stub all components
// before they are rendered in shallow mode. We also need to ensure that
Expand All @@ -60,7 +64,10 @@ export function patchRender (_Vue, stubs, stubAllComponents) {
function patchRenderMixin () {
const vm = this

if (vm.$options.$_doNotStubChildren || vm._isFunctionalContainer) {
if (
vm.$options.$_doNotStubChildren ||
vm.$options._isFunctionalContainer
) {
return
}

Expand All @@ -73,12 +80,11 @@ export function patchRender (_Vue, stubs, stubAllComponents) {
return originalCreateElement(el, ...args)
}

if (isConstructor(el)) {
if (isConstructor(el) || isComponentOptions(el)) {
if (stubAllComponents) {
const stub = createStubFromComponent(el, el.name || 'anonymous')
return originalCreateElement(stub, ...args)
}

const Constructor = shouldExtend(el, _Vue) ? extend(el, _Vue) : el

return originalCreateElement(Constructor, ...args)
Expand Down
2 changes: 1 addition & 1 deletion test/specs/mounting-options/slots.spec.js
View file
Open in desktop
Expand Up @@ -56,7 +56,7 @@ describeWithMountingMethods('options.slots', mountingMethod => {
}
})

it('mounts component with default slot if passed object with template prop in slot object', () => {
it('mounts component with default slot if passed compiled options in slot object', () => {
const compiled = compileToFunctions('<div id="div" />')
const wrapper = mountingMethod(ComponentWithSlots, {
slots: { default: [compiled] }
Expand Down
18 changes: 12 additions & 6 deletions test/specs/shallow-mount.spec.js
View file
Open in desktop
Expand Up @@ -445,10 +445,10 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
const TestComponent = {
template: `
<div>
<ChildComponent text="normal" />
<component :is="dataComponent" text="data" />
<component :is="computedComponent" text="computed" />
<component :is="methodComponent()" text="method" />
<ChildComponent />
<component :is="dataComponent" />
<component :is="computedComponent" />
<component :is="methodComponent()" />
</div>
`,
components: { ChildComponent },
Expand All @@ -472,7 +472,13 @@ describeRunIf(process.env.TEST_ENV !== 'node', 'shallowMount', () => {
}
}
const wrapper = shallowMount(TestComponent)
expect(wrapper.text()).to.equal('')
expect(wrapper.findAll(ChildComponent).length).to.equal(4)
expect(wrapper.html()).to.equal(
'<div>' +
'<childcomponent-stub></childcomponent-stub> ' +
'<anonymous-stub></anonymous-stub> ' +
'<anonymous-stub></anonymous-stub> ' +
'<anonymous-stub></anonymous-stub>' +
'</div>'
)
})
})