test: use local httpbin container on github CI's (#29067)

RocketChat · Jun 7, 2023 · 1e1f467 · 1e1f467
1 parent 924c3ef
commit 1e1f467
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/.github/workflows/ci-test-e2e.yml b/.github/workflows/ci-test-e2e.yml
@@ -96,6 +96,23 @@ jobs:
 
       - uses: dtinth/setup-github-actions-caching-for-turbo@v1
 
+      - name: Start httpbin container and wait for it to be ready
+        run: |
+          docker run -d -p 10000:80 --name httpbin-container kennethreitz/httpbin
+          i=0
+          while [ $i -lt 10 ]; do
+            if curl -s -o /dev/null http://localhost:10000; then
+              echo "httpbin is running"
+              break
+            fi
+            i=$((i + 1))
+            sleep 5
+          done
+          if [ $i -eq 10 ]; then
+            echo "Failed to verify httpbin is running"
+            exit 1
+          fi
+
       - name: yarn build
         run: yarn build
 

diff --git a/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts b/apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
@@ -122,6 +122,7 @@ describe('LIVECHAT - Integrations', function () {
 	});
 
 	describe('Livechat - Webhooks', () => {
+		const webhookUrl = process.env.WEBHOOK_TEST_URL || 'https://httpbin.org';
 		describe('livechat/webhook.test', () => {
 			it('should fail when user doesnt have view-livechat-webhooks permission', async () => {
 				await updatePermission('view-livechat-webhooks', []);
@@ -136,14 +137,12 @@ describe('LIVECHAT - Integrations', function () {
 				expect(response.body).to.have.property('success', false);
 			});
 			it('should return true if webhook test went good', async () => {
-				await updateSetting('Livechat_webhookUrl', 'https://httpbin.org/status/200');
-				await setTimeout(() => null, 1000);
+				await updateSetting('Livechat_webhookUrl', `${webhookUrl}/status/200`);
 				const response = await request.post(api('livechat/webhook.test')).set(credentials).expect(200);
 				expect(response.body.success).to.be.true;
 			});
 			it('should fail if webhook test went bad', async () => {
-				await updateSetting('Livechat_webhookUrl', 'https://httpbin.org/status/400');
-				await setTimeout(() => null, 1000);
+				await updateSetting('Livechat_webhookUrl', `${webhookUrl}/status/400`);
 				await request.post(api('livechat/webhook.test')).set(credentials).expect(400);
 			});
 		});

diff --git a/docker-compose-ci.yml b/docker-compose-ci.yml
@@ -15,6 +15,7 @@ services:
       - 'TRANSPORTER=${TRANSPORTER}'
       - MOLECULER_LOG_LEVEL=info
       - 'ROCKETCHAT_LICENSE=${ENTERPRISE_LICENSE}'
+      - 'WEBHOOK_TEST_URL=host.docker.internal:10000'
     extra_hosts:
       - 'host.docker.internal:host-gateway'
     depends_on:
@@ -110,7 +111,7 @@ services:
       - 'host.docker.internal:host-gateway'
     depends_on:
       - nats
-  
+
   queue-worker-service:
     platform: linux/amd64
     build:
@@ -126,7 +127,7 @@ services:
       - 'host.docker.internal:host-gateway'
     depends_on:
       - nats
-  
+
   omnichannel-transcript-service:
     platform: linux/amd64
     build: