[#361] [CLEANUP] Dé-duplication de la validation d'e-mail.

live/app/components/follower-form.js

@@ -1,5 +1,6 @@
 import Ember from 'ember';
 import ENV from 'pix-live/config/environment';
+import isEmailValid from 'pix-live/utils/email-validator';
 
 const messageDisplayDuration = 1500;
 
@@ -21,7 +22,6 @@ export default Ember.Component.extend({
 
   classNames: ['follower-form'],
 
-  emailValidator: Ember.inject.service('email-validator'),
   store: Ember.inject.service(),
   errorType:'invalid' ,
   status: 'empty', // empty | pending | success | error
@@ -63,18 +63,11 @@ export default Ember.Component.extend({
     return (this.get('status') === 'pending') ? 'envoi en cours' : 's\'inscrire';
   }),
 
-  _checkEmail(email){
-    if (!this.get('emailValidator').emailIsValid(email)) {
-      return false;
-    }
-    return true;
-  },
-
   actions: {
     submit(){
       this.set('status', 'pending');
       const email = (this.get('followerEmail'))? this.get('followerEmail').trim() : '';
-      if (!this._checkEmail(email) || email.length < 1) {
+      if (!isEmailValid(email)) {
         this.set('status', 'error');
         hideMessageDiv(this);
         return;

live/app/utils/email-validator.js

@@ -1,5 +1,8 @@
-export default function isValidate(email) {
-  //XXX: Cf - http://stackoverflow.com/a/46181/5430854
+export default function isEmailValid(email) {
+  if (!email) {
+    return false;
+  }
+  // From http://stackoverflow.com/a/46181/5430854
   const pattern = /^(([^<>()\[\]\.,;:\s@\"]+(\.[^<>()\[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i;
   return pattern.test(email.trim());
 }

live/tests/unit/services/email-validator-test.js → live/tests/unit/utils/email-validator-test.js

@@ -1,20 +1,9 @@
 import {expect} from 'chai';
 import {describe, it} from 'mocha';
-import {setupTest} from 'ember-mocha';
+import isEmailValid from 'pix-live/utils/email-validator';
 
-describe('Unit | Service | EmailValidatorService', function () {
-
-  setupTest('service:email-validator', {});
-  let validator;
-  beforeEach(function () {
-    validator = this.subject();
-  });
-
-  it('exists', function () {
-    expect(validator).to.be.ok;
-  });
-
-  describe('Test all case Invalid and then valid email', function () {
+describe('Unit | Utility | email validator', function () {
+  describe('Invalid emails', function () {
     [
       '',
       ' ',
@@ -27,10 +16,12 @@ describe('Unit | Service | EmailValidatorService', function () {
       '@pix'
     ].forEach(function (badEmail) {
       it(`should return false when email is invalid: ${badEmail}`, function () {
-        expect(validator.emailIsValid(badEmail)).to.be.false;
+        expect(isEmailValid(badEmail)).to.be.false;
       });
     });
+  });
 
+  describe('Valid emails', function () {
     [
       'follower@pix.fr',
       'follower@pix.fr ',
@@ -43,10 +34,8 @@ describe('Unit | Service | EmailValidatorService', function () {
       'follower+beta@pix.beta.gouv.fr'
     ].forEach(function (validEmail) {
       it(`should return true if provided email is valid: ${validEmail}`, function () {
-        expect(validator.emailIsValid(validEmail)).to.be.true;
+        expect(isEmailValid(validEmail)).to.be.true;
       });
     });
   });
-
-
 });