Merge pull request #260 from Arquisoft/develop

Corrigiendo errores menores

restapi/server.ts

@@ -1,6 +1,6 @@
-import express, {Request, Response} from 'express'; 
-import cors from "cors";
+import express from 'express'; 
 import mongoose from 'mongoose';
+import cors from "cors";
 import { json } from 'body-parser';
 import config from './config'
 import { productoRouter } from './rutas/productoRutas';
@@ -9,8 +9,8 @@ import { pedidoRouter } from './rutas/pedidoRutas';
 import http from 'http';
 import "dotenv/config";
 import path from "path";
-const app = express()
 
+const app = express()
 
 app.use(json())
 app.use(cors())

restapi/tests/api.test.tsx

@@ -6,21 +6,6 @@ let app: Application;
 const servidor = require('./servidor_test');
 
 beforeAll(async () => {
-    /* app = express();
-    const port: number = 5000;
-    const options: cors.CorsOptions = {
-        origin: ['http://localhost:3000']
-    };
-    app.use(cors(options));
-    app.use(bp.json());
-    app.use("/api", api);
-
-    server = app.listen(port, (): void => {
-        console.log('Servidor Restapi para testing escuchando en ' + port);
-    }).on("error", (error: Error) => {
-        console.error('Error ocurrido: ' + error.message);
-    }) */
-
     // Iniciar la base de datos
     await servidor.startBD();
     // Iniciar el servidor
@@ -110,7 +95,7 @@ describe('pedidos', () => {
 
             expect(response.statusCode).toBe(200);
 
-            // admin tiene 3 pedidos
+            // admin tiene 4 pedidos
             expect(pedidos.length).toEqual(4);
         });
 });

restapi/tests/servidor_test.tsx

@@ -5,7 +5,6 @@
 
  const { MongoMemoryServer } = require("mongodb-memory-server");
  const express = require('express');
- const cors = require('cors');
  const mongoose = require('mongoose');
  const api = require('../api');
 
@@ -32,8 +31,6 @@
 
      var app = express();
 
-     app.use(cors());
-     app.options("*", cors());
      app.use(express.json());
      app.use("/api", api);
 

webapp/jest.config.ts

@@ -1,5 +1,10 @@
 export default {
+    collectCoverage: true,
+    collectCoverageFrom: [ "src/components/Cart/**","src/components/Details/**",
+    "src/components/Fragments/**","src/components/Home/**", "src/components/Login/**",
+    "src/components/Requets/**", "src/components/Developers/**" ,"src/App.tsx"], 
     transform: {
         "^.+\\.tsx?$": "ts-jest"
     },
+
 }

webapp/package.json

@@ -42,6 +42,13 @@
     "eject": "react-scripts eject",
     "prod": "ts-node-dev ./server.ts"
   },
+  "jest": {
+    "collectCoverageFrom": [
+      "src/components/Cart/**","src/components/Details/**",
+      "src/components/Fragments/**","src/components/Home/**", "src/components/Login/**",
+      "src/components/Requets/**", "src/components/Developers/**" ,"src/App.tsx"
+    ]
+  },
   "eslintConfig": {
     "extends": [
       "react-app",