fix(validatable): update external messages to accept null value

fixes #6025
vuetifyjs · Jan 2, 2019 · eef7d4f · eef7d4f
1 parent 6102624
commit eef7d4f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 5 deletions.
diff --git a/packages/vuetify/src/mixins/validatable.ts b/packages/vuetify/src/mixins/validatable.ts
@@ -79,7 +79,7 @@ export default mixins(
       )
     },
     externalError (): boolean {
-      return this.errorMessages.length > 0 || this.error
+      return this.internalErrorMessages.length > 0 || this.error
     },
     hasMessages (): boolean {
       return this.validationTarget.length > 0
@@ -127,7 +127,7 @@ export default mixins(
       return undefined
     },
     validationTarget (): VuetifyRuleValidations {
-      if (this.errorMessages.length > 0) {
+      if (this.internalErrorMessages.length > 0) {
         return this.internalErrorMessages
       } else if (this.successMessages.length > 0) {
         return this.internalSuccessMessages
@@ -196,9 +196,9 @@ export default mixins(
 
   methods: {
     genInternalMessages (messages: VuetifyMessage): VuetifyRuleValidations {
-      if (Array.isArray(messages)) return messages
-
-      return [messages]
+      if (!messages) return []
+      else if (Array.isArray(messages)) return messages
+      else return [messages]
     },
     /** @public */
     reset () {

diff --git a/packages/vuetify/test/unit/mixins/validatable.spec.js b/packages/vuetify/test/unit/mixins/validatable.spec.js
@@ -343,4 +343,24 @@ test('validatable.js', ({ mount }) => {
     expect(wrapper.vm.isResetting).toBe(true)
     expect(wrapper.vm.internalValue).toEqual([])
   })
+
+  // https://github.com/vuetifyjs/vuetify/issues/6025
+  it('should accept null for external messages', () => {
+    const wrapper = mount(Mock, {
+      propsData: {
+        errorMessages: ['Foobar']
+      }
+    })
+
+    expect(wrapper.vm.externalError).toBe(true)
+
+    wrapper.setProps({ errorMessages: [] })
+    expect(wrapper.vm.externalError).toBe(false)
+
+    wrapper.setProps({ errorMessages: 'Fizzbuzz' })
+    expect(wrapper.vm.externalError).toBe(true)
+
+    wrapper.setProps({ errorMessages: null })
+    expect(wrapper.vm.externalError).toBe(false)
+  })
 })