#10 Combining tests

- Combined all tests

.gitea/workflows/DRBv3_Build_tests.yaml

@@ -1,4 +1,4 @@
-name: DRB Socket Communication Tests
+name: DRB Build Tests
 
 on:
   pull_request:
@@ -22,7 +22,7 @@ env:
   PDAB_PORT: ${{ vars.PDAB_PORT }}
 
 jobs:
-  test:
+  drb_build_and_test:
     runs-on: ubuntu-latest
 
     services:
@@ -38,12 +38,12 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v2
 
       - name: Setup Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v2
         with:
-          node-version: "20"
+          node-version: '20'
 
       - name: Remove package-lock.json (Server)
         working-directory: "./server"
@@ -61,9 +61,9 @@ jobs:
         working-directory: "./client"
         run: rm package-lock.json
 
-      - name: Install dependencies (Client)
+      - name: Run setup process
         working-directory: "./client"
-        run: npm install
+        run: make -j4      
 
       - run: echo "Node has finished installing dependencies"
 
@@ -75,4 +75,8 @@ jobs:
         working-directory: "./client"
         run: npm test
 
-      - run: echo "Completed the tests"
+      - run: echo "Completed the NPM tests"      
+
+      - name: Start discord-radio-bot service
+        working-directory: "./client"
+        run: systemctl start discord-radio-bot.service

.gitea/workflows/DRBv3_Client_Build_test.yaml

@@ -1,28 +0,0 @@
-name: DRB Client Makefile Build Test
-
-on:
-  pull_request:
-    branches:
-      - master
-  push:
-    branches:
-      - master
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: '14'
-
-      - name: Run setup process
-        run: make -j4
-
-      - name: Start discord-radio-bot service
-        run: systemctl start discord-radio-bot.service

.gitea/workflows/client_tests.yaml.BAK

@@ -1,40 +0,0 @@
-name: Client Tests
-
-on: [push, pull_request]
-
-env:
-  NODE_ENV: development
-  DISCORD_CLIENT_ID: ${{ vars.DISCORD_CLIENT_ID }}
-  TEST_CHANNEL_ID: ${{ vars.TEST_CHANNEL_ID }}
-  TEST_GUILD_ID: ${{ vars.TEST_GUILD_ID }}
-  EXPECTED_CLIENT_ID: ${{ vars.EXPECTED_CLIENT_ID }}
-  PDAB_PORT: ${{ vars.PDAB_PORT }}
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-
-      - name: Remove package-lock.json
-        working-directory: "./client"
-        run: rm package-lock.json
-
-      - name: Install dependencies
-        working-directory: "./client"
-        run: npm install
-
-      - run: echo "Node has finished installing dependencies"
-
-      - name: Run tests
-        working-directory: "./client"
-        run: npm test
-
-      - run: echo "Completed the tests"

.gitea/workflows/server_tests.yaml.BAK

@@ -1,55 +0,0 @@
-name: Run Socket Server Tests
-
-on: [push, pull_request]
-
-env:
-  NODE_ENV: development
-  MONGO_INITDB_ROOT_USERNAME: admin
-  MONGO_INITDB_ROOT_PASSWORD: admin
-  MONGO_INITDB_DATABASE: drb
-  SERVER_PORT: 6000
-  MONGO_URL: "mongodb://mongodb:27017/drb"
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    services:
-      mongodb:
-        image: mongo:latest
-        ports:
-          - 27017:27017
-        options: >-
-          --health-cmd mongo
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version: "20"
-
-      - name: Remove package-lock.json
-        working-directory: "./server"
-        run: rm package-lock.json
-
-      - name: Install Node-GYP
-        working-directory: "./server"
-        run: npm install -g node-gyp
-
-      - name: Install dependencies
-        working-directory: "./server"
-        run: npm install
-
-      - run: echo "Node has finished installing dependencies"
-
-      - name: Run tests
-        working-directory: "./server"
-        run: npm test
-
-      - run: echo "Completed the tests"