fix: acceptance tests cannot access mock server

Author: kobenguyent

.github/workflows/acceptance-tests.yml

@@ -32,16 +32,6 @@ jobs:
           sudo apt-get update --allow-releaseinfo-change
           sudo apt-get install -y docker-compose
 
-      # Start mock server
-      - name: Start mock server
-        run: nohup npm run mock-server:start &
-      - name: Wait for mock server
-        run: |
-          for i in {1..20}; do
-            curl -sSf http://localhost:3001/api/users && break
-            sleep 1
-          done
-
       # Run rest tests using docker-compose
       - name: Run REST Tests
         run: docker-compose run --rm test-rest
@@ -56,7 +46,3 @@ jobs:
       - name: Run Faker BDD Tests
         run: docker-compose run --rm test-bdd.faker
         working-directory: test
-
-      # Stop mock server
-      - name: Stop mock server
-        run: npm run mock-server:stop

test/docker-compose.yml

@@ -7,9 +7,12 @@ services:
       env_file: .env
       volumes:
         - ./:/codecept/test
+      environment:
+        - MOCK_SERVER_HOST=mock_server
     command: ['/codecept/node_modules/.bin/mocha', 'test/rest']
     depends_on:
       - json_server
+      - mock_server
 
   test-acceptance.webdriverio:
     build: ..
@@ -73,6 +76,16 @@ services:
       - '8010:8010' # Expose to host
     restart: always # Automatically restart the container if it fails or becomes unhealthy
 
+  mock_server:
+    <<: *test-service
+    entrypoint: []
+    command: npm run mock-server:start
+    ports:
+      - '3001:3001' # Expose to host
+    restart: always # Automatically restart the container if it fails or becomes unhealthy
+    environment:
+      - PORT=3001
+
   puppeteer-image:
     image: ghcr.io/puppeteer/puppeteer:22.4.1
 

test/mock-server/server.js

@@ -8,11 +8,29 @@ let users = [
   { id: 2, name: 'Jane Smith', email: '[email protected]' },
 ]
 
+// Example comments data
+let comments = [{ id: 1, postId: 1, text: 'Great post!' }]
+
 // GET /api/users
 app.get('/api/users', (req, res) => {
   res.json({ data: users })
 })
 
+// GET /api/comments/:id
+app.get('/api/comments/:id', (req, res) => {
+  const comment = comments.find(c => c.id === parseInt(req.params.id))
+  if (comment) {
+    return res.json({
+      data: comment,
+      support: {
+        url: 'http://example.com/support',
+        text: 'Support information',
+      },
+    })
+  }
+  res.status(404).json({ error: 'Comment not found' })
+})
+
 // GET /api/users/:id
 app.get('/api/users/:id', (req, res) => {
   const user = users.find(u => u.id === parseInt(req.params.id))

test/rest/REST_test.js

@@ -150,7 +150,8 @@ describe('REST', () => {
     })
 
     it('should be able to parse JSON responses', async () => {
-      await I.sendGetRequest('http://localhost:3001/api/comments/1', { 'x-api-key': 'reqres-free-v1' })
+      const mockServerHost = process.env.MOCK_SERVER_HOST || 'localhost'
+      await I.sendGetRequest(`http://${mockServerHost}:3001/api/comments/1`, { 'x-api-key': 'reqres-free-v1' })
       await jsonResponse.seeResponseCodeIsSuccessful()
       await jsonResponse.seeResponseContainsKeys(['data', 'support'])
     })