Merge pull request #40 from highideas/develop

GabrielDeveloper · web-flow · commit 10607bfdbab4 · 2017-01-18T14:57:48.000-02:00
Bug fix
diff --git a/app/components/Area/Create/Area.js b/app/components/Area/Create/Area.js
@@ -21,9 +21,13 @@ class Area extends React.Component
         e.preventDefault();
 
         let form = e.target;
+        let parent = '';
+        if (form.querySelector('[name="parent"]')) {
+            parent = form.querySelector('[name="parent"]').value;
+        }
         let formData = {
             _id : this.refs.area.value,
-            parent: form.querySelector('[name="parent"]').value
+            parent: parent
         };
 
         this.setState({area: formData});
diff --git a/app/components/Area/List/Area.js b/app/components/Area/List/Area.js
@@ -13,6 +13,8 @@ class Area extends React.Component
             areas : null,
             error : ''
         };
+        this.showError = this.showError.bind(this);
+        this.listAreas = this.listAreas.bind(this);
         this.getAreas();
     }
 
@@ -27,15 +29,11 @@ class Area extends React.Component
         });
     }
 
-    render() {
+    listAreas() {
         if (this.state.error) {
-            return (<Error error={this.state.error} />);
-        }
-        if (!this.state.areas) {
-            return <div>Loading...</div>;
+            return '';
         }
-        const areaList = this.state.areas.map((area, key) => {
-            let line = ((key % 2) ? 'is-success' : 'is-info');
+        return this.state.areas.map((area, key) => {
             return (
                 <tr key={key}>
                     <td>
@@ -44,10 +42,24 @@ class Area extends React.Component
                 </tr>
             );
         });
+    }
+
+    showError() {
+        if (this.state.error) {
+            return (<Error error={this.state.error} />);
+        }
+        return '';
+    }
+
+    render() {
+        if (!this.state.areas && !this.state.error) {
+            return <div>Loading...</div>;
+        }
 
         return (
             <section className="">
                 <div className="container hello">
+                    { this.showError() }
                     <div className="level header">
                         <div className="level-left">
                             <h2 className="title is-2">Areas</h2>
@@ -63,7 +75,7 @@ class Area extends React.Component
                     </div>
                     <table className="table">
                         <tbody>
-                            { areaList }
+                            { this.listAreas() }
                         </tbody>
                     </table>
                 </div>
diff --git a/app/components/Client/List/Client.js b/app/components/Client/List/Client.js
@@ -12,6 +12,8 @@ class Client extends React.Component
             clients : null,
             error : ''
         };
+        this.showError = this.showError.bind(this);
+        this.listClients = this.listClients.bind(this);
         this.getClients();
     }
 
@@ -26,14 +28,18 @@ class Client extends React.Component
         });
     }
 
-    render() {
+    showError() {
         if (this.state.error) {
             return (<Error error={this.state.error} />);
         }
-        if (!this.state.clients) {
-            return <div>Loading...</div>;
+        return '';
+    }
+
+    listClients() {
+        if (this.state.error) {
+            return '';
         }
-        const clientList = this.state.clients.map((client, key) => {
+        return this.state.clients.map((client, key) => {
             let line = ((key % 2) ? 'is-success' : 'is-info');
             return (
                 <tr key={key}>
@@ -58,10 +64,17 @@ class Client extends React.Component
                 </tr>
             );
         });
+    }
+
+    render() {
+        if (!this.state.clients && !this.state.error) {
+            return <div>Loading...</div>;
+        }
 
         return (
             <section className="">
                 <div className="container hello">
+                    { this.showError() }
                     <div className="level header">
                         <div className="level-left">
                             <h2 className="title is-2">iClient</h2>
@@ -77,7 +90,7 @@ class Client extends React.Component
                     </div>
                     <table className="table">
                         <tbody>
-                            { clientList }
+                            { this.listClients() }
                         </tbody>
                     </table>
                 </div>
diff --git a/app/components/Client/Save/Client.js b/app/components/Client/Save/Client.js
@@ -164,7 +164,9 @@ class Client extends React.Component
                                             name='area'
                                             value={ this.state.client.area }
                                             onChange={this.handleChange}
+                                            required="true"
                                         >
+                                            <option value="">Select One</option>
                                             {
                                                 this.state.areas.map((area, key) => (
                                                     <option value={ area._id } key={ key }>{ area._id}</option>
diff --git a/app/components/Visit/Show/Visit.js b/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}
diff --git a/app/components/Visit/Visit.js b/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" />
diff --git a/app/helpers/Date.js b/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;
diff --git a/app/helpers/DateHelper.js b/app/helpers/DateHelper.js
diff --git a/tests/Create.Area.test.js b/tests/Create.Area.test.js
@@ -256,5 +256,50 @@ describe('Test Create Area', () => {
             }
         }, 0);
     });
+
+    it('Should return data on submit when first time using areas', (done) => {
+
+        let areaInput;
+        let areaSelected;
+        let Area = require('components/Area/Create/Area').default;
+        let mockAdapter = new MockAdapter(axios);
+        let component = mount(
+            <Area />,
+            { context }
+        );
+        let expected = {
+            _id : 'Test',
+            parent : '',
+        }
+
+        mockAdapter
+            .onGet(HOST + '/api/v1/area').reply(404, {error: "Not Found"})
+            .onPost(HOST + '/api/v1/area').reply(201)
+
+        setTimeout(() => {
+
+            try {
+
+                let inputs = {
+                    area : component.find('input'),
+                    parent : component.find('select'),
+                }
+
+                areaInput = component.find('input');
+                areaInput.node.value = 'Test';
+                areaInput.simulate('change', areaInput);
+
+                expect(component.find('.is-danger').text()).toEqual('Not Found');
+
+                component.find('form').simulate('submit', { target: component.find('form').get(0) });
+
+                expect(component.state().area).toEqual(expected);
+                expect(component.state().error).toEqual('');
+                done();
+            } catch (e) {
+                console.log(e);
+            }
+        }, 25);
+    });
 });
 
diff --git a/tests/DateHelper.test.js b/tests/DateHelper.test.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();
+    });
+});
diff --git a/tests/List.Area.test.js b/tests/List.Area.test.js
@@ -35,7 +35,7 @@ describe('Test Area', () => {
         setTimeout(() => {
             try {
                 component.update();
-                expect(component.render().text()).toEqual('Area Not Found');
+                expect(component.render().find('.is-danger').text()).toEqual('Area Not Found');
                 done();
             } catch (e) {
                 console.log(e);
@@ -62,7 +62,7 @@ describe('Test Area', () => {
         setTimeout(() => {
             try {
                 component.update();
-                expect(component.render().text()).toEqual('Error Found: Trying get area');
+                expect(component.render().find('.is-danger').text()).toEqual('Error Found: Trying get area');
                 done();
             } catch (e) {
                 console.log(e);
diff --git a/tests/List.Client.test.js b/tests/List.Client.test.js
@@ -33,9 +33,13 @@ describe('Test Client', () => {
         );
 
         setTimeout(() => {
-            component.update();
-            expect(component.render().text()).toEqual('Client Not Found');
-            done();
+            try {
+                component.update();
+                expect(component.render().find('.is-danger').text()).toEqual('Client Not Found');
+                done();
+            } catch (e) {
+                console.log(e);
+            }
         }, 0);
     });
 
@@ -55,9 +59,13 @@ describe('Test Client', () => {
         );
 
         setTimeout(() => {
-            component.update();
-            expect(component.render().text()).toEqual('Error Found: Trying get client');
-            done();
+            try {
+                component.update();
+                expect(component.render().find('.is-danger').text()).toEqual('Error Found: Trying get client');
+                done();
+            } catch (e) {
+                console.log(e);
+            }
         }, 0);
     });
 
diff --git a/tests/Save.Client.test.js b/tests/Save.Client.test.js
@@ -277,10 +277,14 @@ describe('Test Save Client', () => {
         );
 
         setTimeout(() => {
-
-            expect(component.find('select option').at(0).text()).toEqual('Center');
-            expect(component.find('select option').at(1).text()).toEqual('South');
-            done();
+            try {
+                expect(component.find('select option').at(0).text()).toEqual('Select One');
+                expect(component.find('select option').at(1).text()).toEqual('Center');
+                expect(component.find('select option').at(2).text()).toEqual('South');
+                done();
+            } catch (e) {
+                console.log(e);
+            }
         }, 0);
     });
 
diff --git a/tests/Show.Visit.test.js b/tests/Show.Visit.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');
diff --git a/tests/Visit.test.js b/tests/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();
     });

Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,9 @@ class Client extends React.Component`
`164`	`164`	`name='area'`
`165`	`165`	`value={ this.state.client.area }`
`166`	`166`	`onChange={this.handleChange}`
	`167`	`+ required="true"`
`167`	`168`	`>`
	`169`	`+ <option value="">Select One</option>`
`168`	`170`	`{`
`169`	`171`	`this.state.areas.map((area, key) => (`
`170`	`172`	`<option value={ area._id } key={ key }>{ area._id}</option>`