Skip to content

Commit 4af6f7d

Browse files
marcodearaujomarcodearaujo
committed
Change to use global const HOST
1 parent 63e2c1c commit 4af6f7d

File tree

10 files changed

+29
-25
lines changed

10 files changed

+29
-25
lines changed

‎app/services/Client.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import axios from 'axios';
22

3-
import { HOST } from 'constants/Server';
4-
53
const Client = {
64

75
getClients() {

‎app/services/User.js‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import axios from 'axios';
2-
import { HOST } from 'constants/Server';
32

43
const User = {
54
login(username, password) {

‎app/services/Visit.js‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import axios from 'axios';
22

3-
import { HOST } from 'constants/Server';
4-
53
const Visit = {
64
getGroupByArea() {
75
let config = {

‎package.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@
4747
"app"
4848
],
4949
"collectCoverage": true,
50+
"globals" : {
51+
"HOST" : "http://localhost:3000"
52+
},
5053
"moduleNameMapper": {
5154
"\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/tests/__mocks__/fileMock.js",
5255
"\\.(css|less)$": "<rootDir>/tests/__mocks__/styleMock.js"

‎tests/Area.test.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ jest.dontMock('services/Visit');
88
jest.dontMock('../tests/__mocks__/AreasResponseMock');
99
jest.dontMock('enzyme');
1010

11-
1211
describe('Test Area', () => {
1312
require('../tests/__mocks__/LocalStorageMock');
1413

@@ -26,7 +25,7 @@ describe('Test Area', () => {
2625
let component;
2726
let mockAdapter = new MockAdapter(axios);
2827

29-
mockAdapter.onGet('http://localhost:3000/api/v1/visit/group/area').reply(404, response);
28+
mockAdapter.onGet(HOST + '/api/v1/visit/group/area').reply(404, response);
3029

3130
Area = require('components/Area/Area').default;
3231

@@ -46,7 +45,7 @@ describe('Test Area', () => {
4645
let component;
4746
let mockAdapter = new MockAdapter(axios);
4847

49-
mockAdapter.onGet('http://localhost:3000/api/v1/visit/group/area').reply(404, {});
48+
mockAdapter.onGet(HOST + '/api/v1/visit/group/area').reply(404, {});
5049

5150
Area = require('components/Area/Area').default;
5251

@@ -67,7 +66,7 @@ describe('Test Area', () => {
6766
let component;
6867
let mockAdapter = new MockAdapter(axios);
6968

70-
mockAdapter.onGet('http://localhost:3000/api/v1/visit/group/area').reply(200, response);
69+
mockAdapter.onGet(HOST + '/api/v1/visit/group/area').reply(200, response);
7170

7271
Area = require('components/Area/Area').default;
7372

‎tests/List.Client.test.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Test Client', () => {
2424
let component;
2525
let mockAdapter = new MockAdapter(axios);
2626

27-
mockAdapter.onGet('http://localhost:3000/api/v1/client').reply(404, response);
27+
mockAdapter.onGet(HOST + '/api/v1/client').reply(404, response);
2828

2929
Client = require('components/Client/List/Client').default;
3030

@@ -46,7 +46,7 @@ describe('Test Client', () => {
4646
let component;
4747
let mockAdapter = new MockAdapter(axios);
4848

49-
mockAdapter.onGet('http://localhost:3000/api/v1/client').reply(503, response);
49+
mockAdapter.onGet(HOST + '/api/v1/client').reply(503, response);
5050

5151
Client = require('components/Client/List/Client').default;
5252

@@ -73,7 +73,7 @@ describe('Test Client', () => {
7373
let component;
7474
let mockAdapter = new MockAdapter(axios);
7575

76-
mockAdapter.onGet('http://localhost:3000/api/v1/client').reply(200, response);
76+
mockAdapter.onGet(HOST + '/api/v1/client').reply(200, response);
7777

7878
Client = require('components/Client/List/Client').default;
7979

‎tests/Login.test.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('Test Login', () => {
4444
let Login = require('components/Login/Login').default;
4545
let mockAdapter = new MockAdapter(axios);
4646

47-
mockAdapter.onPost('http://localhost:3000/authenticate').reply(201, {success: 201, token: 'token_test'});
47+
mockAdapter.onPost(HOST + '/authenticate').reply(201, {success: 201, token: 'token_test'});
4848

4949
let component = mount(
5050
<Login />,
@@ -75,7 +75,7 @@ describe('Test Login', () => {
7575
let Login = require('components/Login/Login').default;
7676
let mockAdapter = new MockAdapter(axios);
7777

78-
mockAdapter.onPost('http://localhost:3000/authenticate').reply(200, {success: 200, token: 'token_test'});
78+
mockAdapter.onPost(HOST + '/authenticate').reply(200, {success: 200, token: 'token_test'});
7979

8080
let component = mount(
8181
<Login />,
@@ -107,7 +107,7 @@ describe('Test Login', () => {
107107
let response = {};
108108
let mockAdapter = new MockAdapter(axios);
109109

110-
mockAdapter.onPost('http://localhost:3000/authenticate').reply(503, response);
110+
mockAdapter.onPost(HOST + '/authenticate').reply(503, response);
111111

112112
let component = mount(
113113
<Login />,
@@ -137,7 +137,7 @@ describe('Test Login', () => {
137137
let response = { error:"User Not Found" };
138138
let mockAdapter = new MockAdapter(axios);
139139

140-
mockAdapter.onPost('http://localhost:3000/authenticate').reply(401, response);
140+
mockAdapter.onPost(HOST + '/authenticate').reply(401, response);
141141

142142
let component = mount(
143143
<Login />,

‎tests/Menu.test.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ describe('Test Menu', () => {
2020

2121
let expectedLinks = [
2222
['/', 'Home'],
23-
['/client', 'Client'],
24-
['/area', 'Area'],
23+
['/clients', 'Clients'],
24+
['/area', 'Areas'],
2525
];
2626

2727
expect(component.state().links).toEqual(expectedLinks);

‎tests/Profile.Client.test.js‎

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@ describe('Test Client', () => {
2727
name: 'Jon Snow',
2828
address: '7 Street',
2929
city: 'Winterfell',
30+
ability: 200,
31+
frequency: 10,
3032
area: {
3133
_id: 'Center',
3234
parents: 'Center'
@@ -38,7 +40,7 @@ describe('Test Client', () => {
3840
let component;
3941
let mockAdapter = new MockAdapter(axios);
4042

41-
mockAdapter.onGet('http://localhost:3000/api/v1/client/' + id).reply(200, response);
43+
mockAdapter.onGet(HOST + '/api/v1/client/' + id).reply(200, response);
4244

4345
Client = require('components/Client/Profile/Client').default;
4446

@@ -49,10 +51,12 @@ describe('Test Client', () => {
4951
setTimeout(() => {
5052

5153
expect(component.find('.name p').at(0).text()).toEqual('Jon Snow');
52-
expect(component.find('.name p').at(1).text()).toEqual('7 Street');
53-
expect(component.find('.name p').at(2).text()).toEqual('Winterfell');
54-
expect(component.find('.followers p').at(0).text()).toEqual('Area');
55-
expect(component.find('.followers p').at(1).text()).toEqual('Center');
54+
expect(component.find('.name p').at(1).text()).toEqual('Address: 7 Street - Winterfell');
55+
expect(component.find('.name p').at(2).text()).toEqual('Area: Center');
56+
expect(component.find('.followers p').at(0).text()).toEqual('10');
57+
expect(component.find('.followers p').at(1).text()).toEqual('Frequency');
58+
expect(component.find('.followers p').at(2).text()).toEqual('200');
59+
expect(component.find('.followers p').at(3).text()).toEqual('Ability');
5660
expect(component.find('.nav-menu span a').at(0).text()).toEqual('Visited');
5761
expect(component.find('.nav-menu span a').at(1).text()).toEqual('Update');
5862
expect(component.find('.nav-menu span a').at(2).text()).toEqual('Schedule');
@@ -69,7 +73,7 @@ describe('Test Client', () => {
6973
let component;
7074
let mockAdapter = new MockAdapter(axios);
7175

72-
mockAdapter.onGet('http://localhost:3000/api/v1/client/' + id).reply(404, response);
76+
mockAdapter.onGet(HOST + '/api/v1/client/' + id).reply(404, response);
7377

7478
Client = require('components/Client/Profile/Client').default;
7579

@@ -93,7 +97,7 @@ describe('Test Client', () => {
9397
let component;
9498
let mockAdapter = new MockAdapter(axios);
9599

96-
mockAdapter.onGet('http://localhost:3000/api/v1/client/' + id).reply(503, response);
100+
mockAdapter.onGet(HOST + '/api/v1/client/' + id).reply(503, response);
97101

98102
Client = require('components/Client/Profile/Client').default;
99103

‎webpack.config.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ module.exports = {
3030
plugins: [
3131
new webpack.optimize.UglifyJsPlugin({
3232
compress: { warnings: false }
33+
}),
34+
new webpack.DefinePlugin({
35+
HOST: JSON.stringify(process.env.HOST || 'http://localhost:3000')
3336
})
3437
],
3538
resolve: {

0 commit comments

Comments
 (0)