Merge pull request #252 from Arquisoft/pablof

Hot Fix Arreglo test

docs/05_building_block_view.adoc

@@ -51,4 +51,12 @@ Contained Building Blocks::
 |Name| Description
 |Webapp | Part of the application that the user will see and interact with.
 |Restapi | Part of the application responsible for persistence.
+|Register | Part of the application responsible for creating new users.
+|Login | Part of the application responsible for user access.
+|Orders | Part of the application responsible for order management.
+|Cart | Part of the application responsible for storing the products that the user wants to buy.
+|Products | Part of the application responsible for products management.
+|Cloudinary | External service responsible for storing the images of the application.
+|Shippo | External service responsible for providing the shipping cost.
+|Nodemailer | External service responsible for sending emails.
 |===

webapp/jest.config.ts

@@ -3,5 +3,6 @@ export default {
         "\\.[jt]sx?$": "babel-jest",
         "^.+\\.tsx?$": "ts-jest",
     },
-    collectCoverage: true
+    collectCoverage: true,
+    setupFiles: ['<rootDir>/vars.ts']
 }

webapp/package.json

@@ -31,7 +31,7 @@
   "scripts": {
     "start": "react-scripts start",
     "build": "react-scripts build",
-    "test": "react-scripts test",
+    "test": "react-scripts test --coverage",
     "test:e2e": "start-server-and-test 'npm --prefix ../restapi start' http://localhost:5000/api/product/list prod 3000 'cd e2e && jest'",
     "eject": "react-scripts eject",
     "prod": "ts-node-dev ./server.ts"

webapp/src/components/Cart/Address.test.tsx

@@ -0,0 +1,8 @@
+import { render } from "@testing-library/react";
+import { BrowserRouter} from 'react-router-dom';
+import Address from "./Address";
+
+test('check the address form render properly', async () => {
+    const {getByText} = render(<BrowserRouter><Address/></BrowserRouter>);
+    expect(getByText("Your address")).toBeInTheDocument();
+  });

webapp/src/components/Cart/Payment.test.tsx

@@ -0,0 +1,8 @@
+import { render } from "@testing-library/react";
+import { BrowserRouter} from 'react-router-dom';
+import Payment from "./Payment";
+
+test('check the payment form render properly', async () => {
+    const {getByText} = render(<BrowserRouter><Payment/></BrowserRouter>);
+    expect(getByText("Payment")).toBeInTheDocument();
+  });

webapp/src/components/Order/Order.test.tsx

@@ -0,0 +1,29 @@
+import { render } from "@testing-library/react";
+import { BrowserRouter } from 'react-router-dom';
+import Order from "./Order";
+import * as api from '../Services/OrderService'
+import { Item, OrderType, Producto, User } from "../../shared/sharedtypes";
+import { ReactSession } from 'react-client-session';
+
+jest.mock('../Services/OrderService');
+
+test('check the payment form render properly', async () => {
+    const user: User = {
+        username: process.env.USER2!,
+        password: process.env.USER2!,
+        token: ""
+    };
+    const product: Producto = { category: 'cellular', name: 'IPhone', description: 'a', urlImage: 'aaaaa', basePrice: 200, units: 2, onSale: true, IVA: 0.21 };
+    const listProd: Item[] = [{ producto: product, num: 3 }];
+    const order: OrderType = {
+        _id: '', user: user,
+        products: listProd,
+        totalPrice: 0
+    };
+    ReactSession.set("user", user);
+    jest.spyOn(api, 'getOrder').mockImplementation((id: String, token: string): Promise<OrderType> => Promise.resolve(order));
+
+    const { getByText, container } = render(<BrowserRouter><Order /></BrowserRouter>);
+    expect(getByText("Order")).toBeInTheDocument();
+
+});

webapp/src/components/Order/Order.tsx

@@ -18,17 +18,18 @@ const Order = () => {
   const params = useParams();
 
   const loadOrder = async () => {
-    let user = ReactSession.get("user");
-    let res = await orderService.getOrder(params._id as string,user.token);
-    if(res.data.order){
-      setOrder(res.data.order)
+      let user = ReactSession.get("user");
+      let ord = await orderService.getOrder(params._id as string,user.token);
+      
+      setOrder(ord);
       let prods:Product[] = [];
-      for(var p in res.data.order.products){
-        var product = {name:p,num:res.data.order.products[p]};
-        prods.push(product);
+      if(order != undefined){
+        for(var p in order!.products){
+          var product = {name:p,num:order!.products[p].num};
+          prods.push(product);
+        }
+        setProductos(prods); 
       }
-      setProductos(prods); 
-    }
   }
 
   const download = () => {

webapp/src/components/Order/Orders.tsx

@@ -9,14 +9,15 @@ const Orders = () => {
   const [orders, setOrders] = useState<OrderType[]>([]);
 
   const loadOrders = async () => {
-    let res = await orderService.getOrdersOf(ReactSession.get("user"));
-    setOrders(res.data.orders);
+      let res = await orderService.getOrdersOf(ReactSession.get("user"));
+      setOrders(res.data.orders);
   }
 
   useEffect(() => {
     loadOrders();
   }, [])
 
+
   return (
     <div>
       <h1 className='title'>My orders</h1>

webapp/src/components/Services/OrderService.ts

@@ -15,7 +15,8 @@ export const getOrdersOf = async (u: User) => {
 };
 
 export const getOrder = async (id: string, token:string) => {
-    return await axios.get(`${API}/order/`+id, {headers:{'Authorization': token}});
+    let res = await axios.get(`${API}/order/`+id, {headers:{'Authorization': token}});
+    return res.data.order;
 };
 
 export const getShippingDetails = async (user:string, address: AddressType, token:string) => {

webapp/vars.ts

@@ -1,4 +1,6 @@
 process.env.USER = 'pruebaprueba'
 process.env.PASS = 'PruebaPrueba1+'
 process.env.BADUSER = 'pru'
-process.env.BADPASS = 'Prueb'
+process.env.BADPASS = 'Prueb'
+process.env.USER2= 'user'
+process.env.PASS2= 'user'