Merge pull request #33 from fabiothiroki/app-tests

add more flow
fabiothiroki · May 1, 2021 · f2a511e · f2a511e
2 parents cf5010e + 46fa6e9
commit f2a511e
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 39 deletions.
diff --git a/flow-typed/airport.js.flow b/flow-typed/airport.js.flow
@@ -0,0 +1,7 @@
+// @flow
+
+declare type Airport = {
+  id: string,
+  code: string,
+  name: string,
+};
diff --git a/src/components/AirportSelector/AirportSelector.js b/src/components/AirportSelector/AirportSelector.js
@@ -5,23 +5,10 @@ import throttle from "lodash.throttle";
 import { useQuery } from "react-query";
 import PropTypes from "prop-types";
 import getAirportsByTerm from "../../services/Airport/airportService";
+import formatAirportResults from "../../services/Airport/airportResponseFormatter";
 
 const throttled = throttle((searchTerm) => getAirportsByTerm(searchTerm), 200);
 
-const formatAirportResults = (results, selectedAirport) => {
-  const formattedData = [];
-
-  if (selectedAirport) {
-    formattedData.push(selectedAirport);
-  }
-
-  if (results && results.locations) {
-    return formattedData.concat(results.locations);
-  }
-
-  return formattedData;
-};
-
 const AirportSelector = ({ inputLabel, onChange, name }) => {
   const [inputValue, setInputValue] = useState("");
   const [selectedAirport, setSelectedAirport] = useState(null);

diff --git a/src/components/App/tests/App.test.js b/src/components/App/tests/App.test.js
@@ -0,0 +1,5 @@
+import App from "../App";
+
+test("Render initial state", () => {
+  expect(App).toBeDefined();
+});
diff --git a/src/components/Search/tests/Search.test.js b/src/components/Search/tests/Search.test.js
@@ -62,26 +62,14 @@ test("Form submission", async () => {
     expect(props.onSearchSubmitted).toHaveBeenCalledWith({
       departureDate: "2020-05-13",
       destination: {
-        active: true,
-        airport_int_id: 5212,
         code: "PRG",
-        icao: "LKPR",
         id: "PRG",
-        int_id: 5212,
         name: "Václav Havel Airport Prague",
-        slug: "vaclav-havel-airport-prague-prague-czechia",
-        slug_en: "vaclav-havel-airport-prague-prague-czechia",
       },
       origin: {
-        active: true,
-        airport_int_id: 5212,
         code: "PRG",
-        icao: "LKPR",
         id: "PRG",
-        int_id: 5212,
         name: "Václav Havel Airport Prague",
-        slug: "vaclav-havel-airport-prague-prague-czechia",
-        slug_en: "vaclav-havel-airport-prague-prague-czechia",
       },
       returnDate: "2020-05-15",
     })

diff --git a/src/services/Airport/airportResponseFormatter.js b/src/services/Airport/airportResponseFormatter.js
@@ -0,0 +1,20 @@
+// @flow
+
+const formatAirportResults = (
+  results?: { locations?: Array<Airport> },
+  selectedAirport: Airport
+): Airport[] => {
+  const formattedData = [];
+
+  if (selectedAirport) {
+    formattedData.push(selectedAirport);
+  }
+
+  if (results && results.locations) {
+    return formattedData.concat(results.locations);
+  }
+
+  return formattedData;
+};
+
+export default formatAirportResults;
diff --git a/src/services/Airport/test/mockAirportReponse.js b/src/services/Airport/test/mockAirportReponse.js
@@ -1,26 +1,16 @@
-const mockAirportResponse = {
+// @flow
+
+const mockAirportResponse: { locations: Array<Airport> } = {
   locations: [
     {
       id: "PRG",
-      int_id: 5212,
-      airport_int_id: 5212,
-      active: true,
       code: "PRG",
-      icao: "LKPR",
       name: "Václav Havel Airport Prague",
-      slug: "vaclav-havel-airport-prague-prague-czechia",
-      slug_en: "vaclav-havel-airport-prague-prague-czechia",
     },
     {
       id: "BCN",
-      int_id: 431,
-      airport_int_id: 431,
-      active: true,
       code: "BCN",
-      icao: "LEBL",
       name: "Barcelona–El Prat",
-      slug: "barcelona-el-prat-barcelona-spain",
-      slug_en: "barcelona-el-prat-barcelona-spain",
     },
   ],
 };