Merge pull request #39 from GabrielDeveloper/develop

Develop

Author: GabrielDeveloper

app/components/Visit/Show/Visit.js

@@ -4,7 +4,7 @@ import { Link } from 'react-router'
 import VisitService from 'services/Visit'
 import Error from 'components/Error/Error'
 import styles from 'components/Visit/Show/styles.css'
-import DateHelper from 'helpers/DateHelper'
+import DateHelper from 'helpers/Date'
 
 class Visit extends React.Component
 {
@@ -51,7 +51,7 @@ class Visit extends React.Component
                                     <strong>{this.state.visit.client.name}</strong>
                                 </h3>
                             <p className="tagline">
-                                <strong>Visit Date: </strong>{DateHelper.formateDate(this.state.visit.visit_date)}
+                                <strong>Visit Date: </strong>{DateHelper.format(this.state.visit.visit_date)}
                             </p>
                             <p className="tagline">
                                 <strong>Address: </strong>{this.state.visit.client.address}

app/components/Visit/Visit.js

@@ -1,5 +1,6 @@
 import React from 'react';
 import { Link } from 'react-router'
+import DateHelper from 'helpers/Date'
 
 class Visit extends React.Component
 {
@@ -15,7 +16,7 @@ class Visit extends React.Component
         return this.state.visits.map((areaVisit, key) => (
             <tr key={ key } >
                 <td>{ areaVisit.visit.client.name }</td>
-                <td>{ areaVisit.visit.visit_date }</td>
+                <td>{ DateHelper.format(areaVisit.visit.visit_date) }</td>
                 <td className="is-icon">
                     <Link to={ `/visit/${areaVisit.visit._id}` } >
                         <i className="fa fa-info-circle" />

app/helpers/Date.js

@@ -0,0 +1,13 @@
+const Date = {
+    format(date) {
+        let dateObj = new window.Date(date);
+        let options = {
+            day: '2-digit',
+            month: '2-digit',
+            year: 'numeric'
+        }
+        return dateObj.toGMTString();
+    }
+}
+
+export default Date;

app/helpers/DateHelper.js

@@ -0,0 +1,11 @@
+
+describe('Test DateHelper', () => {
+
+    const DateHelper = require('helpers/Date').default;
+
+    it ('should return date on format GMT', (done) => {
+        let date = DateHelper.format('2016-10-19T13:30:13.329Z');
+        expect(date).toEqual("Wed, 19 Oct 2016 13:30:13 GMT");
+        done();
+    });
+});

tests/DateHelper.test.js

@@ -7,7 +7,7 @@ jest.dontMock('axios');
 jest.dontMock('axios-mock-adapter');
 jest.dontMock('enzyme');
 jest.dontMock('services/Visit');
-jest.dontMock('helpers/DateHelper');
+jest.dontMock('helpers/Date');
 
 describe('Test Visit', () => {
     require('../tests/__mocks__/LocalStorageMock');
@@ -57,7 +57,7 @@ describe('Test Visit', () => {
         setTimeout(() => {
 
             try {
-                expect(component.find('.name p').at(0).text()).toEqual('Visit Date: 10/01/2017');
+                expect(component.find('.name p').at(0).text()).toEqual('Visit Date: Sun, 01 Oct 2017 00:00:00 GMT');
                 expect(component.find('.name p').at(1).text()).toEqual('Address: 7 Street');
                 expect(component.find('.name p').at(2).text()).toEqual('Area: Center');
                 expect(component.find('.followers p').at(0).text()).toEqual('R$ 300');

tests/Show.Visit.test.js

@@ -53,11 +53,11 @@ describe('Test Visit', () => {
 
         expect(component.find('td').length).toEqual(6);
         expect(component.find('td').at(0).text()).toEqual('Jon Snow');
-        expect(component.find('td').at(1).text()).toEqual('2016-10-19T13:30:13.329Z');
+        expect(component.find('td').at(1).text()).toEqual('Wed, 19 Oct 2016 13:30:13 GMT');
         expect(component.find('td').at(2).text()).toEqual('<Link />');
 
         expect(component.find('td').at(3).text()).toEqual('Cotter Pyke');
-        expect(component.find('td').at(4).text()).toEqual('2016-10-18T13:31:14.430Z');
+        expect(component.find('td').at(4).text()).toEqual('Tue, 18 Oct 2016 13:31:14 GMT');
         expect(component.find('td').at(5).text()).toEqual('<Link />');
         done();
     });