fix: tests reporting properly

.github/workflows/kalatori-test.yml

@@ -41,17 +41,18 @@ jobs:
           sudo chmod +x /usr/local/bin/docker-compose
           docker-compose --version
 
-      - name: Build and Start Containers
+      - name: Build Containers
         working-directory: ./tests
         run: |
-          docker-compose up -d --build chopsticks-polkadot chopsticks-statemint kalatori-rust-app
+          docker-compose build
 
-      - name: Wait for Dependencies to Initialize
-        run: sleep 60
+      - name: Run Tests
+        working-directory: ./tests
+        run: |
+          docker-compose up --exit-code-from tests --abort-on-container-exit tests
 
-      - name: Run Tests and Capture Exit Code
+      - name: Tear Down Containers
         working-directory: ./tests
+        if: always()
         run: |
-          docker-compose run tests || exit_code=$?
           docker-compose down
-          exit ${exit_code:-0}

tests/docker-compose.yml

@@ -52,4 +52,4 @@ services:
       - kalatori-rust-app
     environment:
       - DAEMON_HOST=http://kalatori-daemon:16726
-    command: /bin/sh -c "sleep 50 && yarn install && yarn test"
+    command: /bin/sh -c "sleep 180 && yarn install && yarn test"

tests/kalatori-api-test-suite/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "main": "index.js",
   "scripts": {
-    "test": "jest"
+    "test": "jest --silent"
   },
   "keywords": [],
   "author": "",

tests/kalatori-api-test-suite/src/polkadot.ts

@@ -47,5 +47,5 @@ export async function transferFunds(rpcUrl: string, paymentAccount: string, amou
   });
 
   // Wait for transaction to be included in block
-  await new Promise(resolve => setTimeout(resolve, 10000));
+  await new Promise(resolve => setTimeout(resolve, 15000));
 }

tests/kalatori-api-test-suite/tests/order.test.ts

@@ -225,8 +225,7 @@ describe('Order Endpoint Blackbox Tests', () => {
 
     await transferFunds(orderDetails.currency.rpc_url, paymentAccount, dotOrderData.amount);
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 35000));
+    await new Promise(resolve => setTimeout(resolve, 20000));
 
     const repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('paid');
@@ -247,9 +246,6 @@ describe('Order Endpoint Blackbox Tests', () => {
       orderDetails.currency.asset_id
     );
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
-
     const repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('paid');
     expect(repaidOrderDetails.withdrawal_status).toBe('completed');
@@ -271,8 +267,6 @@ describe('Order Endpoint Blackbox Tests', () => {
         halfAmount,
         orderDetails.currency.asset_id
     );
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
 
     let repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('pending');
@@ -286,9 +280,6 @@ describe('Order Endpoint Blackbox Tests', () => {
         orderDetails.currency.asset_id
     );
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
-
     repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('paid');
     expect(repaidOrderDetails.withdrawal_status).toBe('completed');
@@ -310,8 +301,6 @@ describe('Order Endpoint Blackbox Tests', () => {
       halfAmount,
       orderDetails.currency.asset_id
     );
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
 
     let repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('pending');
@@ -325,9 +314,6 @@ describe('Order Endpoint Blackbox Tests', () => {
       orderDetails.currency.asset_id
     );
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
-
     repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('paid');
     expect(repaidOrderDetails.withdrawal_status).toBe('completed');
@@ -348,9 +334,6 @@ describe('Order Endpoint Blackbox Tests', () => {
       assetId
     );
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
-
     const repaidOrderDetails = await getOrderDetails(orderId);
     expect(repaidOrderDetails.payment_status).toBe('pending');
     expect(repaidOrderDetails.withdrawal_status).toBe('waiting');
@@ -365,9 +348,6 @@ describe('Order Endpoint Blackbox Tests', () => {
 
     await transferFunds(orderDetails.currency.rpc_url, paymentAccount, dotOrderData.amount/2);
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
-
     const partiallyRepaidOrderDetails = await getOrderDetails(orderId);
     expect(partiallyRepaidOrderDetails.payment_status).toBe('pending');
     expect(partiallyRepaidOrderDetails.withdrawal_status).toBe('waiting');
@@ -390,9 +370,6 @@ describe('Order Endpoint Blackbox Tests', () => {
 
     await transferFunds(orderDetails.currency.rpc_url, paymentAccount, usdcOrderData.amount/2);
 
-    // lets wait for the changes to get propagated on chain and app to catch them
-    await new Promise(resolve => setTimeout(resolve, 15000));
-
     const partiallyRepaidOrderDetails = await getOrderDetails(orderId);
     expect(partiallyRepaidOrderDetails.payment_status).toBe('pending');
     expect(partiallyRepaidOrderDetails.withdrawal_status).toBe('waiting');