Skip to content

Check property exists instead of truthy value #5044

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

Merged
merged 2 commits into from
Mar 1, 2017
+9 −9
Merged

Check property exists instead of truthy value #5044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85afbbe
Check property exists instead of truthy value
znck Mar 1, 2017
6ea789f
Provide some falsy values for inject tests
znck Mar 1, 2017
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
2 changes: 1 addition & 1 deletion src/core/instance/inject.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export function initInjections (vm: Component) {
const provideKey = isArray ? key : inject[key]
let source = vm
while (source) {
if (source._provided && source._provided[provideKey]) {
if (source._provided && provideKey in source._provided) {
vm[key] = source._provided[provideKey]
break
}
Expand Down
16 changes: 8 additions & 8 deletions test/unit/features/options/inject.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ describe('Options provide/inject', () => {
template: `<child/>`,
provide: {
foo: 1,
bar: 2
bar: false
},
components: {
child: {
Expand All @@ -32,15 +32,15 @@ describe('Options provide/inject', () => {
}
}).$mount()

expect(injected).toEqual([1, 2])
expect(injected).toEqual([1, false])
})

it('should use closest parent', () => {
new Vue({
template: `<child/>`,
provide: {
foo: 1,
bar: 2
bar: null
},
components: {
child: {
Expand All @@ -55,15 +55,15 @@ describe('Options provide/inject', () => {
}
}).$mount()

expect(injected).toEqual([3, 2])
expect(injected).toEqual([3, null])
})

it('provide function', () => {
new Vue({
template: `<child/>`,
data: {
a: 1,
b: 2
b: false
},
provide () {
return {
Expand All @@ -81,7 +81,7 @@ describe('Options provide/inject', () => {
}
}).$mount()

expect(injected).toEqual([1, 2])
expect(injected).toEqual([1, false])
})

it('inject with alias', () => {
Expand All @@ -99,7 +99,7 @@ describe('Options provide/inject', () => {
new Vue({
template: `<child/>`,
provide: {
foo: 1,
foo: false,
bar: 2
},
components: {
Expand All @@ -112,7 +112,7 @@ describe('Options provide/inject', () => {
}
}).$mount()

expect(injected).toEqual([1, 2])
expect(injected).toEqual([false, 2])
})

it('self-inject', () => {
Expand Down