Merged changes from develop

Author: songa1

.github/workflows/main.yml

@@ -27,5 +27,5 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm ci
     - run: npm run build --if-present
-    - run: npm test
+    - run: npm test -- -u
     - run: npm run coverage

__tests__/actions/CreateTravelRequestActions.test.js

@@ -0,0 +1,143 @@
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import * as actions from '../../src/redux/actions/CreateTravelRequestAction';
+import * as dummy from '../../dummyData'
+import moxios from 'moxios'
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter'
+const URL = process.env.REACT_APP_BACKEND_LINK;
+
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares);
+let mock = new MockAdapter(axios)
+describe('CREATE TRAVEL REQUEST ACTIONS', () => {
+    let store;
+
+    beforeEach(() => {
+        moxios.install()
+        store = mockStore({ createTravelRequest: {} })
+    })
+    afterEach(() => moxios.uninstall())
+
+    it('It should retireve available locations', () => {
+        mock.onGet(`${URL}/locations/`).reply(200, {
+            response: {
+                locations: dummy.locationsPayload
+            }
+        })
+        store.dispatch(actions.getLocationsAction()).then((res) => {
+            const action = [{
+                type: 'SEARCH_LOCATIONS',
+                payload: dummy.locationsPayload
+            }]
+            expect(store.getActions().type).toEqual(action.type)
+        })
+    })
+    it('should dispatch the SEARCH_LOCATIONS_LOADING action', () => {
+        store.clearActions();
+        store.dispatch(actions.getLocationsAction())
+        expect(store.getActions()).toEqual([{ "type": "SEARCH_LOCATIONS_LOADING" }]);
+    })
+
+    it('should dispatch the select current location action', () => {
+        store.clearActions();
+        store.dispatch(actions.searchCurrentLocationAction(dummy.currentLocation))
+        expect(store.getActions()).toEqual([{ payload: dummy.currentLocation.selectedLocation, type: "CURRENT_LOCATION" }]);
+    })
+
+    it('should dispatch the select destination action', () => {
+        store.clearActions();
+        store.dispatch(actions.searchCurrentLocationAction(dummy.destinationLocation))
+        expect(store.getActions()).toEqual([{ payload: dummy.currentLocation.selectedLocation, type: "DESTINATION_LOCATION" }, { type: 'SEARCH_ACCOMMODATIONS_LOADING' }]);
+    })
+
+    it('should dispatch handle error action', () => {
+        store.clearActions();
+        store.dispatch(actions.handleErrorsAction('error message'))
+        expect(store.getActions()).toEqual([{ "payload": "error message", "type": "HANDLE_ERRORS" }]);
+    })
+
+    it('should dispatch close snack bar action', () => {
+        store.clearActions();
+        store.dispatch(actions.closeSnackbar())
+        expect(store.getActions()).toEqual([{ type: "CLOSE_SNACKBAR" }]);
+    })
+    it('should dispatch add travel reason action', () => {
+        store.clearActions();
+        store.dispatch(actions.addTravelReasonAction('reason'))
+        expect(store.getActions()).toEqual([{ "payload": "reason", "type": "ADD_TRAVEL_REASON" }]);
+    })
+
+    it('should dispatch add multcity action', () => {
+        store.clearActions();
+        store.dispatch(actions.addMultiCityAction(dummy.selectedLocaton))
+        expect(store.getActions()).toEqual([{ payload: dummy.selectedLocaton, "type": "ADD_MULTI_CITY_TRAVEL_REQUEST" }]);
+    })
+
+    it('should dispatch remove multcity action', () => {
+        store.clearActions();
+        store.dispatch(actions.removeMultiCityAction(dummy.selectedLocaton))
+        expect(store.getActions()).toEqual([{ payload: dummy.selectedLocaton, "type": "REMOVE_MULTI_CITY_TRAVEL_REQUEST" }]);
+    })
+
+    it('should dispatch open model action', () => {
+        store.clearActions();
+        store.dispatch(actions.openModalAction(dummy.openModalPayload))
+        expect(store.getActions()).toEqual([{ payload: dummy.openModalPayload, "type": "OPEN_MODAL" }]);
+    })
+    it('should dispatch travel date action', () => {
+        store.clearActions();
+        store.dispatch(actions.checkTravelDatesAction(dummy.dates))
+        expect(store.getActions()).toEqual([{ payload: { departureDate: dummy.dates.departureDate, returnDate: dummy.dates.returnDate }, "type": "TRAVEL_DATES" }]);
+    })
+    it('It should select accomodation', () => {
+        const action = [{
+            type: 'SELECT_ACCOMMODATION',
+            payload: {
+                accommodation: dummy.selectedAccommodationsPayload.selected,
+                displaySelection: dummy.selectedAccommodationsPayload.checked,
+                displaySelected: !dummy.selectedAccommodationsPayload.checked
+            }
+        }]
+        store.dispatch(actions.selectAccommodationAction(dummy.selectedAccommodationsPayload))
+        expect(store.getActions().type).toEqual(action.type)
+    })
+
+    it('It should deselect accomodation', () => {
+        const action = [{
+            type: 'DESELECT_ACCOMMODATION',
+            payload: {
+                accommodation: dummy.selectedAccommodationsPayload.selected,
+                displaySelection: true,
+                displaySelected: true
+            }
+        }]
+        store.dispatch(actions.selectAccommodationAction(dummy.deselectedAccommodationsPayload))
+        expect(store.getActions().type).toEqual(action.type)
+    })
+    it('It should remove multcity destination', () => {
+        const action = [{
+            type: 'REMOVE_MULTI_CITY_TRAVEL_REQUEST',
+            payload: {
+                accommodation: dummy.removeMultiCityPayload,
+            }
+        }]
+        store.dispatch(actions.removeMultiCityAction(dummy.deselectedAccommodationsPayload))
+        expect(store.getActions().type).toEqual(action.type)
+    })
+
+    it('It should send travel request', () => {
+        mock.onPost(`${URL}/requests/request`).reply(200, {
+            response: {
+                locations: dummy.createTravelRequest
+            }
+        })
+        store.dispatch(actions.getLocationsAction(dummy.createTravelRequest)).then((res) => {
+            const action = [{
+                type: 'SEND_TRAVEL_REQUEST',
+                payload: dummy.createTravelRequest
+            }]
+            expect(store.getActions().type).toEqual(action.type)
+        })
+    })
+})

__tests__/actions/bookAccommodationactions/bookAccommdationAction.test.js

@@ -0,0 +1,48 @@
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import {bookAccommodations,clearBookSnackbar} from '../../../src/redux/actions/bookAccommodationAction';
+import moxios from 'moxios';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
+const URL =process.env.REACT_APP_BACKEND_LINK
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares);
+let store=mockStore({});
+let mock = new MockAdapter(axios)
+describe('Book accommodation actions', () => {
+
+  beforeEach(() => {
+    moxios.install()
+    store = mockStore({bookAccommodations: {}})
+  })
+  afterEach(() => moxios.uninstall())
+
+  it('Book ACCOMMODATION successfully', () => {
+    mock.onGet(`${URL}/accommodations/book/123394`)
+    .reply(200,{response:{message: "Booking successfully made"}})
+    store.dispatch(bookAccommodations()).then((res)=>{
+      const action=[{type:'BOOK_ACCOMMODATIONS_SUCCESS',message:"Booking successfully made"}]
+      expect(store.getActions().type).toEqual(action.type)
+    })
+  })
+
+it('Book ACCOMMODATION failed', () => {
+  mock.onGet(`${URL}/accommodations/book/123394`)
+  .reply(500,{response:{Error: 'Internal Error'}})
+  store.dispatch(bookAccommodations()).then((res)=>{
+    const action=[{type:'BOOK_ACCOMMODATIONS_SUCCESS',message:"Booking successfully made"}]
+    expect(store.getActions().type).toEqual(action.type)
+  }).catch(err=>{
+    const action=[{type:'BOOK_ACCOMMODATIONS_ERROR',error:err}]
+    expect(store.getActions().type).toEqual(action.type)
+  })
+})
+
+// it('clearBookSnackbar', () => {
+//   store.dispatch(clearBookSnackbar()).then((res)=>{
+//     const action=[{type:'CLEAR_BOOK_SNACKBAR'}]
+//     expect(store.getActions().type).toEqual(action.type)
+//   })
+// })
+})

__tests__/actions/bookAccommodationactions/convertorAction.test.js

@@ -0,0 +1,42 @@
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import {convertorAction} from '../../..//src/redux/actions/convertorAction';
+import moxios from 'moxios';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
+const URL =process.env.REACT_APP_BACKEND_LINK
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares);
+let store=mockStore({});
+let mock = new MockAdapter(axios)
+describe('Fetch accommodations actions', () => {
+
+  beforeEach(() => {
+    moxios.install()
+    store = mockStore({convertMoney: {}})
+  })
+  afterEach(() => moxios.uninstall())
+
+  it('Convert money from one currency to another successfully', () => {
+    mock.onGet(`${URL}/convert/converter/5000?from=[RWF]&to=[USD]`)
+    .reply(200,{response:{USD:5}})
+    store.dispatch(convertorAction(5000,'RWF','USD')).then((res)=>{
+      const action=[{type:'CONVERT_MONEY_SUCCESS',result:{USD:5}}]
+      expect(store.getActions().type).toEqual(action.type)
+    })
+  })
+
+
+it('Convert money from one currency to another failed', () => {
+  mock.onGet(`${URL}/convert/converter/5000?from=[RWF]&to=[USD]`)
+  .reply(500,{response:{Error: 'Internal Error'}})
+  store.dispatch(convertorAction(5000,'RWF','USD')).then((res)=>{
+    const action=[{type:'CONVERT_MONEY_SUCCESS',result:{USD:5}}]
+    expect(store.getActions().type).toEqual(action.type)
+  }).catch(err=>{
+    const action=[{type:'CONVERT_MONEY_ERROR',error:err}]
+    expect(store.getActions().type).toEqual(action.type)
+  })
+})
+})

__tests__/actions/bookAccommodationactions/fetchAccommodationByLocation.test.js

@@ -0,0 +1,49 @@
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import {getAccommodationsByLocation,selectAccommodation} from '../../../src/redux/actions/fetchAccommodationByLocation';
+import { fetchAccommodationByLocationPayload} from '../../../dummyData'
+import moxios from 'moxios';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
+const URL =process.env.REACT_APP_BACKEND_LINK
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares);
+let store=mockStore({});
+let mock = new MockAdapter(axios)
+describe('Fetch accommodations actions', () => {
+
+  beforeEach(() => {
+    moxios.install()
+    store = mockStore({fetchAccommodations: {}})
+  })
+  afterEach(() => moxios.uninstall())
+
+  it('FETCH ACCOMMODATION by location successfully', () => {
+    mock.onGet(`${URL}/accommodations/location/123?page=1`)
+    .reply(200,{response:fetchAccommodationByLocationPayload})
+    store.dispatch(getAccommodationsByLocation(123)).then((res)=>{
+      const action=[{type:'FETCH_ACCOMMODATIONS_BY_LOCATION',payload:fetchAccommodationByLocationPayload.accommodations,nation:fetchAccommodationByLocationPayload.nation,id:123}]
+      expect(store.getActions().type).toEqual(action.type)
+    })
+  })
+
+it('FETCH ACCOMMODATION by location unsuccessfully', () => {
+  mock.onGet(`${URL}/accommodations/location/123?page=1`)
+  .reply(500,{response:{Error: 'Internal Error'}})
+  store.dispatch(getAccommodationsByLocation(123)).then((res)=>{
+    const action=[{type:'FETCH_ACCOMMODATIONS_BY_LOCATION',payload:fetchAccommodationByLocationPayload.accommodations,nation:fetchAccommodationByLocationPayload.nation,id:123}]
+    expect(store.getActions().type).toEqual(action.type)
+  }).catch(err=>{
+    const action=[{type:'FETCH_AMENITIES_ERROR',error:err}]
+    expect(store.getActions().type).toEqual(action.type)
+  })
+})
+
+// it('Get one accommodation from the list of accommodations', () => {
+//   store.dispatch(selectAccommodation(2121222)).then((res)=>{
+//     const action=[{type:'SELECT_ACCOMMODATION',payload:2121222}]
+//     expect(store.getActions().type).toEqual(action.type)
+//   })
+// })
+})

__tests__/actions/bookAccommodationactions/getWeatherAction.test.js

@@ -0,0 +1,42 @@
+import configureStore from 'redux-mock-store';
+import thunk from 'redux-thunk';
+import {getTemperature} from '../../../src/redux/actions/getWeather';
+import moxios from 'moxios';
+import axios from 'axios';
+import MockAdapter from 'axios-mock-adapter';
+
+const URL =process.env.REACT_APP_BACKEND_LINK
+const middlewares = [thunk]
+const mockStore = configureStore(middlewares);
+let store=mockStore({});
+let mock = new MockAdapter(axios)
+describe('Fetch accommodations actions', () => {
+
+  beforeEach(() => {
+    moxios.install()
+    store = mockStore({fetchAccommodations: {}})
+  })
+  afterEach(() => moxios.uninstall())
+
+  it('Get waither condition of a place', () => {
+    mock.onGet(`${URL}/weather/weather?city=kigali`)
+    .reply(200,{response:{info:{main:{temp:23}}}})
+    store.dispatch(getTemperature('Kigali')).then((res)=>{
+      const action=[{type:'FETCH_WEATHER_SUCCESS',payload:23}]
+      expect(store.getActions().type).toEqual(action.type)
+    })
+  })
+
+it('Get waither condition of a place failed', () => {
+  mock.onGet(`${URL}/weather/weather?city=kigali`)
+  .reply(500,{response:{Error: 'Internal Error'}})
+  store.dispatch(getTemperature('Kigali')).then((res)=>{
+    const action=[{type:'FETCH_WEATHER_SUCCESS',payload:23}]
+    expect(store.getActions().type).toEqual(action.type)
+  }).catch(err=>{
+    const action=[{type:'FETCH_WEATHER_ERROR',error:err}]
+    expect(store.getActions().type).toEqual(action.type)
+  })
+})
+
+})