Commit 5e3e5a7

authored

Merge pull request TheAlgorithms#501 from baciucristian/email-validation

Modify ValidateEmail.js to accept all suffixes not just '.com'

2 parents 879b8ad + a57323b commit 5e3e5a7Copy full SHA for 5e3e5a7

File tree

-5

lines changed

-5

lines changed

Lines changed: 2 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,16 @@`
`2`	`2`	`function that takes a string input and return either it is true of false`
`3`	`3`	`a valid email address`
`4`	`4`	`e.g.: mahfoudh.arous@gmail.com -> true`
	`5`	`+ e.g.: mahfoudh.arous@helsinki.edu -> true`
`5`	`6`	`e.g.: mahfoudh.arous.com ->false`
`6`	`7`	`*/`
`7`	`8`
`8`	`9`	`const validateEmail = (str) => {`
`9`	`10`	`if (str === '' \|\| str === null) {`
`10`	`11`	`throw new TypeError('Email Address String Null or Empty.')`
`11`	`12`	`}`
`12`		`- if (str.startsWith('@') === true \|\| !str.includes('@') \|\| !str.endsWith('.com')) {`
`13`		`- return false`
`14`		`- }`
`15`	`13`
`16`		`- return true`
	`14`	`+ return /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(str)`
`17`	`15`	`}`
`18`	`16`
`19`	`17`	`export { validateEmail }`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { validateEmail } from './ValidateEmail'`
	`1`	`+import { validateEmail } from '../ValidateEmail'`
`2`	`2`
`3`	`3`	`describe('Validation of an Email Address', () => {`
`4`	`4`	`it('expects to return false', () => {`
`@@ -13,6 +13,10 @@ describe('Validation of an Email Address', () => {`
`13`	`13`	`expect(validateEmail('mahfoudh.arous@gmail.com')).toEqual(true)`
`14`	`14`	`})`
`15`	`15`
	`16`	`+ it('expects to return true', () => {`
	`17`	`+ expect(validateEmail('icristianbaciu@.helsinki.edu')).toEqual(true)`
	`18`	`+ })`
	`19`	`+`
`16`	`20`	`it('expects to throw a type error', () => {`
`17`	`21`	`expect(() => { validateEmail('') }).toThrow('Email Address String Null or Empty.')`
`18`	`22`	`})`

Comments

(0)