Skip to content

Commit 4b52a6b

Browse files
Merge remote-tracking branch 'origin' into release
2 parents 091154d + 72e5575 commit 4b52a6b

35 files changed

Lines changed: 4272 additions & 48 deletions

.github/workflows/docker-image-rc.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on:
88
jobs:
99
test:
1010
name: "Test"
11-
uses: "./.github/workflows/integration-tests.yml"
11+
uses: "./.github/workflows/tests.yml"
1212
build:
1313
name: "Build & Publish"
1414
runs-on: ubuntu-latest

.github/workflows/docker-image.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
jobs:
77
test:
88
name: "Test"
9-
uses: "./.github/workflows/integration-tests.yml"
9+
uses: "./.github/workflows/tests.yml"
1010
build:
1111
name: "Build & Publish"
1212
runs-on: ubuntu-latest

.github/workflows/integration-tests.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

.github/workflows/tests.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
2+
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs
3+
4+
name: Tests CI
5+
on:
6+
push:
7+
branches: [ "main" ]
8+
pull_request:
9+
branches: [ "main" ]
10+
workflow_dispatch:
11+
workflow_call:
12+
13+
jobs:
14+
unit-tests:
15+
name: "Unit Tests"
16+
runs-on: ubuntu-latest
17+
timeout-minutes: 5
18+
steps:
19+
- uses: actions/checkout@v3
20+
- name: Use Node.js 18.x
21+
uses: actions/setup-node@v3
22+
with:
23+
node-version: 18.x
24+
cache: 'npm'
25+
- name: Install dependencies
26+
run: npm ci
27+
- name: Run unit tests
28+
run: npm run test:unit
29+
30+
integration-tests:
31+
name: "Integration Tests"
32+
runs-on: ubuntu-latest
33+
timeout-minutes: 10
34+
steps:
35+
- uses: actions/checkout@v3
36+
- name: Use Node.js 18.x
37+
uses: actions/setup-node@v3
38+
with:
39+
node-version: 18.x
40+
cache: 'npm'
41+
- name: Install dependencies
42+
run: npm ci
43+
- name: Run integration tests
44+
run: npm test
45+
46+
test-summary:
47+
name: "Test Summary"
48+
runs-on: ubuntu-latest
49+
needs: [unit-tests, integration-tests]
50+
if: always()
51+
steps:
52+
- name: Check test results
53+
run: |
54+
if [[ "${{ needs.unit-tests.result }}" == "success" && "${{ needs.integration-tests.result }}" == "success" ]]; then
55+
echo "✅ All tests passed!"
56+
exit 0
57+
else
58+
echo "❌ Some tests failed!"
59+
echo "Unit tests: ${{ needs.unit-tests.result }}"
60+
echo "Integration tests: ${{ needs.integration-tests.result }}"
61+
exit 1
62+
fi

.mocharc.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"require": ["tsx", "test/unit/setup.ts"],
3+
"timeout": 10000,
4+
"exit": true,
5+
"spec": "test/unit/**/*.spec.ts"
6+
}

docs/docs/Making-Liquid-Production-Ready.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ To send outbound emails from Liquid, say, for account verification and password
4848

4949
#### Using Message Queue (Pusher):
5050

51-
If none of the built-in email providers meet your needs, Liquid can put emails to a queue so that another service can consume them and send emails using your preferred custom provider.
51+
If none of the built-in email providers meet your needs, Liquid can put emails in a queue so that another service can consume them and send emails using your preferred custom provider.
5252

5353
- Set **_system.email-adapter_** to `pusher`.
5454
- Set **_privilege.can-use-push-events_** to `true`.
5555
- Configure your message queue by setting **_system.queue-adapter_** to either `redis` or `rabbitmq`.
5656
- Configure the appropriate queue service (Redis or RabbitMQ) settings.
5757

58-
You should now get a `liquid.email.send` when an email is triggered.
58+
You should now get a `liquid.email.send` event when an email is triggered.
5959

6060
### Caching:
6161

0 commit comments

Comments
 (0)