removes twitter input from apply (Vets-Who-Code#452)

mountainmort · Feb 21, 2023 · f3343cf · f3343cf
1 parent 19e2667
commit f3343cf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 52 deletions.
diff --git a/src/components/Forms/ApplyForm/ApplyForm.js b/src/components/Forms/ApplyForm/ApplyForm.js
@@ -315,33 +315,6 @@ function ApplyForm() {
           <FormAlert errorMessage={errors.yearSeparated.message} />
         )}
       </div>
-      <div className="col-md-8">
-        <div className="form-group">
-          <label htmlFor="twitterAccountName" className="dark-text">
-            Twitter Profile URL<sup>*</sup>
-          </label>
-          <input
-            className="form-control input-lg"
-            id="twitterAccountName"
-            name="twitterAccountName"
-            placeholder="Twitter Profile URL"
-            type="text"
-            ref={register({
-              required: true,
-              pattern: {
-                value: /http(s)?:\/\/(.*\.)?twitter\.com\/[A-z0-9_]+\/?/,
-                message: 'Please enter a valid twitter account url',
-              },
-            })}
-          />
-        </div>
-        {errors.twitterAccountName && errors.twitterAccountName.type === 'required' && (
-          <FormAlert />
-        )}
-        {errors.twitterAccountName && errors.twitterAccountName.type === 'pattern' && (
-          <FormAlert errorMessage={errors.twitterAccountName.message} />
-        )}
-      </div>
       <div className="col-md-8">
         <div className="form-group">
           <label htmlFor="linkedInAccountName" className="dark-text">

diff --git a/src/pages/api/apply.js b/src/pages/api/apply.js
@@ -14,7 +14,6 @@ export default async function handler(req, res) {
     branchOfService,
     yearJoined,
     yearSeparated,
-    twitterAccountName,
     linkedInAccountName,
     githubAccountName,
     preworkLink,
@@ -32,7 +31,6 @@ export default async function handler(req, res) {
     'branchOfService',
     'yearJoined',
     'yearSeparated',
-    'twitterAccountName',
     'linkedInAccountName',
     'githubAccountName',
     'preworkLink',
@@ -59,7 +57,6 @@ export default async function handler(req, res) {
     `\nBranch of Service: \`${branchOfService}\``,
     `\nYear Joined: \`${yearJoined}\``,
     `\nYear Separated: \`${yearSeparated}\``,
-    `\nTwitter Account Name: \`${twitterAccountName}\``,
     `\nLinkedIn Account Name: \`${linkedInAccountName}\``,
     `\nGithub Account Name: \`${githubAccountName}\``,
     `\nPre Work Link: \`${preworkLink}\``,

diff --git a/tests/api/apply.test.js b/tests/api/apply.test.js
@@ -15,7 +15,6 @@ describe('contact handler', () => {
       branchOfService: 'All of them',
       yearJoined: '1990',
       yearSeparated: '1990',
-      twitterAccountName: '@mrstealyoursignificantother',
       linkedInAccountName: 'https://linkedin.com/in/mrstealyoursignificantother',
       githubAccountName: 'https://linkedin.com/in/mrstealyoursignificantother',
       preworkLink: "https://I-didn't-do-the-work",
@@ -47,7 +46,6 @@ describe('contact handler', () => {
       branchOfService: 'All of them',
       yearJoined: '1990',
       yearSeparated: '1990',
-      twitterAccountName: '@mrstealyoursignificantother',
       linkedInAccountName: 'https://linkedin.com/in/mrstealyoursignificantother',
       githubAccountName: 'https://linkedin.com/in/mrstealyoursignificantother',
       preworkLink: "https://I-didn't-do-the-work",
@@ -87,7 +85,6 @@ describe('contact handler', () => {
       branchOfService: 'All of them',
       yearJoined: '1990',
       yearSeparated: '1990',
-      twitterAccountName: '@mrstealyoursignificantother',
       linkedInAccountName: 'https://linkedin.com/in/mrstealyoursignificantother',
       githubAccountName: 'https://linkedin.com/in/mrstealyoursignificantother',
       preworkLink: "https://I-didn't-do-the-work",

diff --git a/tests/components/Forms/ApplyForm.test.js b/tests/components/Forms/ApplyForm.test.js
@@ -14,7 +14,6 @@ describe('<ApplyForm />', () => {
     const branchOfService = container.querySelector('#branchOfService')
     const yearJoined = container.querySelector('#yearJoined')
     const yearSeparated = container.querySelector('#yearSeparated')
-    const twitterAccountName = container.querySelector('#twitterAccountName')
     const linkedInAccountName = container.querySelector('#linkedInAccountName')
     const githubAccountName = container.querySelector('#githubAccountName')
     const preworkLink = container.querySelector('#preworkLink')
@@ -40,7 +39,6 @@ describe('<ApplyForm />', () => {
     fireEvent.input(branchOfService, { target: { value: 'USMC' } })
     fireEvent.input(yearJoined, { target: { value: 2000 } })
     fireEvent.input(yearSeparated, { target: { value: 2004 } })
-    fireEvent.input(twitterAccountName, { target: { value: 'https://twitter.com/fake-user' } })
     fireEvent.input(linkedInAccountName, {
       target: { value: 'https://linkedin.com/in/fake-user' },
     })
@@ -77,7 +75,6 @@ describe('<ApplyForm />', () => {
     const branchOfService = container.querySelector('#branchOfService')
     const yearJoined = container.querySelector('#yearJoined')
     const yearSeparated = container.querySelector('#yearSeparated')
-    const twitterAccountName = container.querySelector('#twitterAccountName')
     const linkedInAccountName = container.querySelector('#linkedInAccountName')
     const githubAccountName = container.querySelector('#githubAccountName')
     const preworkLink = container.querySelector('#preworkLink')
@@ -94,7 +91,6 @@ describe('<ApplyForm />', () => {
     fireEvent.input(branchOfService, { target: { value: 'USMC' } })
     fireEvent.input(yearJoined, { target: { value: 2000 } })
     fireEvent.input(yearSeparated, { target: { value: 2004 } })
-    fireEvent.input(twitterAccountName, { target: { value: 'https://twitter.com/fake-user' } })
     fireEvent.input(linkedInAccountName, {
       target: { value: 'https://linkedin.com/in/fake-user' },
     })
@@ -125,7 +121,6 @@ describe('<ApplyForm />', () => {
     const branchOfService = container.querySelector('#branchOfService')
     const yearJoined = container.querySelector('#yearJoined')
     const yearSeparated = container.querySelector('#yearSeparated')
-    const twitterAccountName = container.querySelector('#twitterAccountName')
     const linkedInAccountName = container.querySelector('#linkedInAccountName')
     const githubAccountName = container.querySelector('#githubAccountName')
     const preworkLink = container.querySelector('#preworkLink')
@@ -142,7 +137,6 @@ describe('<ApplyForm />', () => {
     fireEvent.input(branchOfService, { target: { value: '' } })
     fireEvent.input(yearJoined, { target: { value: '' } })
     fireEvent.input(yearSeparated, { target: { value: '' } })
-    fireEvent.input(twitterAccountName, { target: { value: '' } })
     fireEvent.input(linkedInAccountName, {
       target: { value: '' },
     })
@@ -154,7 +148,7 @@ describe('<ApplyForm />', () => {
 
     const errorMessages = container.querySelectorAll('.alert-danger')
 
-    expect(errorMessages.length).toBe(15)
+    expect(errorMessages.length).toBe(14)
 
     await waitFor(() => {
       fireEvent.input(firstName, { target: { value: 'New' } })
@@ -167,7 +161,6 @@ describe('<ApplyForm />', () => {
       fireEvent.change(branchOfService, { target: { value: 'USMC' } })
       fireEvent.input(yearJoined, { target: { value: 2000 } })
       fireEvent.input(yearSeparated, { target: { value: 2004 } })
-      fireEvent.input(twitterAccountName, { target: { value: 'https://twitter.com/fake-user' } })
       fireEvent.input(linkedInAccountName, {
         target: { value: 'https://linkedin.com/in/fake-user' },
       })
@@ -193,7 +186,6 @@ describe('<ApplyForm />', () => {
     const branchOfService = container.querySelector('#branchOfService')
     const yearJoined = container.querySelector('#yearJoined')
     const yearSeparated = container.querySelector('#yearSeparated')
-    const twitterAccountName = container.querySelector('#twitterAccountName')
     const linkedInAccountName = container.querySelector('#linkedInAccountName')
     const githubAccountName = container.querySelector('#githubAccountName')
     const preworkLink = container.querySelector('#preworkLink')
@@ -204,7 +196,7 @@ describe('<ApplyForm />', () => {
 
     const errorMessages = container.querySelectorAll('.alert-danger')
 
-    expect(errorMessages.length).toBe(15)
+    expect(errorMessages.length).toBe(14)
 
     await waitFor(() => {
       fireEvent.input(firstName, { target: { value: 'New' } })
@@ -217,7 +209,6 @@ describe('<ApplyForm />', () => {
       fireEvent.change(branchOfService, { target: { value: 'USMC' } })
       fireEvent.input(yearJoined, { target: { value: 200 } })
       fireEvent.input(yearSeparated, { target: { value: 204 } })
-      fireEvent.input(twitterAccountName, { target: { value: 'https ://twitter.com/fake-user' } })
       fireEvent.input(linkedInAccountName, {
         target: { value: 'https ://linkedin.com/in/fake-user' },
       })
@@ -227,7 +218,7 @@ describe('<ApplyForm />', () => {
     })
 
     const errorsAfterSubmit = container.querySelectorAll('.alert-danger')
-    expect(errorsAfterSubmit.length).toBe(9)
+    expect(errorsAfterSubmit.length).toBe(8)
     // valid email
     expect(errorsAfterSubmit[0].textContent).toContain('Please enter a valid email address')
     // zip-code custom error
@@ -238,18 +229,16 @@ describe('<ApplyForm />', () => {
     expect(errorsAfterSubmit[2].textContent).toContain('Please enter year in YYYY format')
     // year separated custom error
     expect(errorsAfterSubmit[3].textContent).toContain('Please enter year in YYYY format')
-    // valid twitter account url
-    expect(errorsAfterSubmit[4].textContent).toContain('Please enter a valid twitter account url')
     // valid linkedin account url
-    expect(errorsAfterSubmit[5].textContent).toContain(
+    expect(errorsAfterSubmit[4].textContent).toContain(
       'Please enter a valid LinkedIn url https://linkedin.com/in/user-name'
     )
     // valid github username
-    expect(errorsAfterSubmit[6].textContent).toContain('Please enter your github username')
+    expect(errorsAfterSubmit[5].textContent).toContain('Please enter your github username')
     // valid prework url
-    expect(errorsAfterSubmit[7].textContent).toContain('Please enter a valid url')
+    expect(errorsAfterSubmit[6].textContent).toContain('Please enter a valid url')
     // valid github url
-    expect(errorsAfterSubmit[8].textContent).toContain(
+    expect(errorsAfterSubmit[7].textContent).toContain(
       'Please enter a GitHub repository url https://github.com/user-name/repo-name'
     )
 
@@ -264,7 +253,6 @@ describe('<ApplyForm />', () => {
       fireEvent.input(branchOfService, { target: { value: 'USMC' } })
       fireEvent.input(yearJoined, { target: { value: 2000 } })
       fireEvent.input(yearSeparated, { target: { value: 2004 } })
-      fireEvent.input(twitterAccountName, { target: { value: 'https://twitter.com/fake-user' } })
       fireEvent.input(linkedInAccountName, {
         target: { value: 'https://linkedin.com/in/fake-user' },
       })