From 704f85ebb5f3148b28748aa16824fd8472880388 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Tue, 13 Aug 2019 23:57:50 -0300
Subject: [PATCH 1/4] chore: minor updates to form feedback components

---
 src/components/form/form-invalid-feedback.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/form/form-invalid-feedback.js b/src/components/form/form-invalid-feedback.js
index 291bacd517a..5b99952b429 100644
--- a/src/components/form/form-invalid-feedback.js
+++ b/src/components/form/form-invalid-feedback.js
@@ -19,7 +19,7 @@ export const props = {
     default: false
   },
   state: {
-    type: [Boolean, String],
+    type: Boolean,
     default: null
   },
   ariaLive: {
@@ -38,7 +38,7 @@ export const BFormInvalidFeedback = /*#__PURE__*/ Vue.extend({
   functional: true,
   props,
   render(h, { props, data, children }) {
-    const show = props.forceShow === true || props.state === false || props.state === 'invalid'
+    const show = props.forceShow === true || props.state === false
     return h(
       props.tag,
       mergeData(data, {

From 20f4c00718d99508f39db732d7ccf4ed339ef0d2 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Wed, 14 Aug 2019 00:02:09 -0300
Subject: [PATCH 2/4] Update form-invalid-feedback.spec.js

---
 .../form/form-invalid-feedback.spec.js        | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/components/form/form-invalid-feedback.spec.js b/src/components/form/form-invalid-feedback.spec.js
index 84e850d7370..8e27a03a066 100644
--- a/src/components/form/form-invalid-feedback.spec.js
+++ b/src/components/form/form-invalid-feedback.spec.js
@@ -71,17 +71,6 @@ describe('form-invalid-feedback', () => {
     expect(feedback.classes()).toContain('d-block')
   })
 
-  it('should contain class d-block when state is "invalid"', async () => {
-    const feedback = mount(BFormInvalidFeedback, {
-      context: {
-        props: {
-          state: 'invalid'
-        }
-      }
-    })
-    expect(feedback.classes()).toContain('d-block')
-  })
-
   it('should not contain class d-block when state is true', async () => {
     const feedback = mount(BFormInvalidFeedback, {
       context: {
@@ -93,17 +82,6 @@ describe('form-invalid-feedback', () => {
     expect(feedback.classes()).not.toContain('d-block')
   })
 
-  it('should not contain class d-block when state is "valid"', async () => {
-    const feedback = mount(BFormInvalidFeedback, {
-      context: {
-        props: {
-          state: 'valid'
-        }
-      }
-    })
-    expect(feedback.classes()).not.toContain('d-block')
-  })
-
   it('should contain class d-block when force-show is true and state is true', async () => {
     const feedback = mount(BFormInvalidFeedback, {
       context: {

From 31c45d84d311138b37da34f380f777ada49aee40 Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Wed, 14 Aug 2019 00:04:22 -0300
Subject: [PATCH 3/4] Update form-valid-feedback.js

---
 src/components/form/form-valid-feedback.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/form/form-valid-feedback.js b/src/components/form/form-valid-feedback.js
index bea5fc99adc..66a0fad20f1 100644
--- a/src/components/form/form-valid-feedback.js
+++ b/src/components/form/form-valid-feedback.js
@@ -19,7 +19,7 @@ export const props = {
     default: false
   },
   state: {
-    type: [Boolean, String],
+    type: Boolean,
     default: null
   },
   ariaLive: {
@@ -38,7 +38,7 @@ export const BFormValidFeedback = /*#__PURE__*/ Vue.extend({
   functional: true,
   props,
   render(h, { props, data, children }) {
-    const show = props.forceShow === true || props.state === true || props.state === 'valid'
+    const show = props.forceShow === true || props.state === true
     return h(
       props.tag,
       mergeData(data, {

From b783b24f0b831f1affa99124a8a95892a878225e Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Wed, 14 Aug 2019 00:05:44 -0300
Subject: [PATCH 4/4] Update form-valid-feedback.spec.js

---
 .../form/form-valid-feedback.spec.js          | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/src/components/form/form-valid-feedback.spec.js b/src/components/form/form-valid-feedback.spec.js
index 6bc3b5932ba..8e19faf9a7c 100644
--- a/src/components/form/form-valid-feedback.spec.js
+++ b/src/components/form/form-valid-feedback.spec.js
@@ -71,17 +71,6 @@ describe('form-valid-feedback', () => {
     expect(feedback.classes()).toContain('d-block')
   })
 
-  it('should contain class d-block when state is "valid"', async () => {
-    const feedback = mount(BFormValidFeedback, {
-      context: {
-        props: {
-          state: 'valid'
-        }
-      }
-    })
-    expect(feedback.classes()).toContain('d-block')
-  })
-
   it('should not contain class d-block when state is false', async () => {
     const feedback = mount(BFormValidFeedback, {
       context: {
@@ -93,17 +82,6 @@ describe('form-valid-feedback', () => {
     expect(feedback.classes()).not.toContain('d-block')
   })
 
-  it('should not contain class d-block when state is "invalid"', async () => {
-    const feedback = mount(BFormValidFeedback, {
-      context: {
-        props: {
-          state: 'invalid'
-        }
-      }
-    })
-    expect(feedback.classes()).not.toContain('d-block')
-  })
-
   it('should contain class d-block when force-show is true and state is false', async () => {
     const feedback = mount(BFormValidFeedback, {
       context: {