Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 13 commits into from
May 17, 2023
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4eb5b90
chore: use local httpbin container on github CI's
murtaza98 Apr 27, 2023
245ced8
add verification to ensure httpbin containers are running
murtaza98 Apr 27, 2023
28d833a
skip code scanning
murtaza98 Apr 27, 2023
86398c5
re-add autobuild
murtaza98 Apr 27, 2023
c48d022
avoid retry prop
murtaza98 Apr 27, 2023
0b2cd8f
ignore typechecks
murtaza98 Apr 27, 2023
c973462
..
murtaza98 Apr 27, 2023
ba66b53
using a different method to start httpbin container
murtaza98 Apr 28, 2023
2f1d9a0
Merge branch 'develop' into local-httpbin
murtaza98 Apr 28, 2023
7ac6ca8
start using env variables
murtaza98 Apr 28, 2023
5a5cd09
revert unwanted changes
murtaza98 Apr 28, 2023
88e941b
re-add httpbin tests
murtaza98 Apr 28, 2023
1b0fba6
Update .github/workflows/ci-test-e2e.yml
sampaiodiego May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .github/workflows/ci-test-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
9 changes: 5 additions & 4 deletions apps/meteor/tests/end-to-end/api/livechat/06-integrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', []);
Expand All @@ -134,13 +135,13 @@ describe('LIVECHAT - Integrations', function () {
const response = await request.post(api('livechat/webhook.test')).set(credentials).expect(400);
expect(response.body).to.have.property('success', false);
});
it.skip('should return true if webhook test went good', async () => {
await updateSetting('Livechat_webhookUrl', 'https://httpbin.org/status/200');
it('should return true if webhook test went good', async () => {
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.skip('should fail if webhook test went bad', async () => {
await updateSetting('Livechat_webhookUrl', 'https://httpbin.org/status/400');
it('should fail if webhook test went bad', async () => {
await updateSetting('Livechat_webhookUrl', `${webhookUrl}/status/400`);
await request.post(api('livechat/webhook.test')).set(credentials).expect(400);
});
});
Expand Down
5 changes: 3 additions & 2 deletions docker-compose-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -110,7 +111,7 @@ services:
- 'host.docker.internal:host-gateway'
depends_on:
- nats

queue-worker-service:
platform: linux/amd64
build:
Expand All @@ -126,7 +127,7 @@ services:
- 'host.docker.internal:host-gateway'
depends_on:
- nats

omnichannel-transcript-service:
platform: linux/amd64
build:
Expand Down