E2e test running on 80

Arquisoft · Apr 28, 2024 · 2cad410 · 2cad410
1 parent e1bf1cb
commit 2cad410
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/users/index.js b/users/index.js
@@ -8,7 +8,7 @@ dotenv.config();
 
 // app and port definition
 const app = express();
-const port = process.env.PORT || 8003;
+const port = 8003;
 
 // Connect to MongoDB
 const mongoUri = process.env.MONGODB_URI;

diff --git a/webapp/e2e/jest.config.js b/webapp/e2e/jest.config.js
@@ -1,5 +1,5 @@
 module.exports = {
     testMatch: ["**/steps/*.js"],
-    testTimeout: 40000,
+    testTimeout: 50000,
     setupFilesAfterEnv: ["expect-puppeteer"]
 }
diff --git a/webapp/package.json b/webapp/package.json
@@ -35,9 +35,11 @@
   "scripts": {
     "start": "set PORT=80 && set HTTP=true && react-scripts start",
     "build": "set PORT=80 && set HTTP=true && react-scripts build",
-    "prod": "serve -s build -l 80",
+    "prod": "serve -s build", 
     "test": "react-scripts test --transformIgnorePatterns 'node_modules/(?!axios)/'",
-    "test:e2e": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod http://localhost:80 \"cd e2e && jest\"",
+    "test:e2e": "cd ../webapp && npm run build && npm run test:e2eci",
+    "test:e2eci": "cross-env START_SERVER_AND_TEST_INSECURE=1 PORT=80 npm run rune2etests",
+    "rune2etests": "start-server-and-test 'node e2e/test-environment-setup.js' http://localhost:8000/health prod 80 \"cd e2e && jest\"",
     "eject": "react-scripts eject"
   },
   "eslintConfig": {

diff --git a/wikidataservice/index.js b/wikidataservice/index.js
@@ -6,7 +6,7 @@ const cors = require('cors')
 const { generateQuestions } = require('./src/Services/QuestionGenerator');
 
 const app = express();
-const port = process.env.PORT || 8001;
+const port = 8001;
 const NUMBER_QUESTIONS = 10;
 
 // Middleware to parse JSON in request body