Skip to content

Commit 4c13932

Browse files
Merge branch 'master' into rc
2 parents bce3d28 + 25e66dc commit 4c13932

File tree

4 files changed

+51
-47
lines changed

4 files changed

+51
-47
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -23,51 +23,6 @@ jobs:
2323
- name: 🧪 tsc
2424
run: yarn types --noEmit
2525

26-
e2e:
27-
runs-on: ubuntu-latest
28-
name: End-to-end tests
29-
steps:
30-
- uses: actions/checkout@v3
31-
32-
- name: 💾 Cache Dependencies
33-
uses: actions/cache@v3
34-
with:
35-
path: ./node_modules
36-
key: ${{ runner.os }}-${{ matrix.node }}-modules-${{ hashFiles('**/yarn.lock') }}
37-
38-
- name: 🔨 Install Dependencies
39-
run: yarn install --frozen-lockfile --ignore-engines --ignore-scripts
40-
41-
- name: ⚗️ End-to-end tests
42-
run: |
43-
npx playwright install
44-
npx playwright install-deps
45-
yarn e2e-fixtures
46-
# running with --browser=all causes failures
47-
yarn e2e --browser=chromium
48-
yarn e2e --browser=webkit
49-
yarn e2e --browser=firefox
50-
env:
51-
E2E_JUMP_TO_MESSAGE_CHANNEL: jump-to-message
52-
E2E_ADD_MESSAGE_CHANNEL: add-message
53-
E2E_TEST_USER_1: test-user-1
54-
E2E_TEST_USER_2: test-user-2
55-
E2E_APP_KEY: ${{ secrets.E2E_APP_KEY }}
56-
E2E_APP_SECRET: ${{ secrets.E2E_APP_SECRET }}
57-
E2E_TEST_USER_1_TOKEN: ${{ secrets.E2E_TEST_USER_1_TOKEN }}
58-
E2E_TEST_USER_2_TOKEN: ${{ secrets.E2E_TEST_USER_2_TOKEN }}
59-
E2E_ADDITIONAL_CHANNELS: mr-channel-1, mr-channel-2, edit-message-channel, pin-message-channel
60-
E2E_LONG_MESSAGE_LISTS_CHANNEL: navigate-long-message-lists
61-
E2E_ATTACHMENT_SIZING_CHANNEL: attachment-sizing
62-
63-
- name: 🎥 Upload Artifacts
64-
uses: actions/upload-artifact@v3
65-
if: ${{ always() }}
66-
with:
67-
name: E2E_Artifacts
68-
path: ./test-results
69-
retention-days: 1
70-
7126
test:
7227
runs-on: ubuntu-latest
7328
strategy:

.github/workflows/e2e.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: E2E
2+
3+
on: [push]
4+
5+
jobs:
6+
e2e:
7+
runs-on: ubuntu-latest
8+
name: End-to-end tests
9+
steps:
10+
- uses: actions/checkout@v3
11+
12+
- name: 💾 Cache Dependencies
13+
uses: actions/cache@v3
14+
with:
15+
path: ./node_modules
16+
key: ${{ runner.os }}-${{ matrix.node }}-modules-${{ hashFiles('**/yarn.lock') }}
17+
18+
- name: 🔨 Install Dependencies
19+
run: yarn install --frozen-lockfile --ignore-engines --ignore-scripts
20+
21+
- name: ⚗️ End-to-end tests
22+
run: |
23+
npx playwright install
24+
npx playwright install-deps
25+
yarn e2e-fixtures
26+
# running with --browser=all causes failures
27+
yarn e2e --browser=chromium
28+
yarn e2e --browser=webkit
29+
yarn e2e --browser=firefox
30+
env:
31+
E2E_JUMP_TO_MESSAGE_CHANNEL: jump-to-message
32+
E2E_ADD_MESSAGE_CHANNEL: add-message
33+
E2E_TEST_USER_1: test-user-1
34+
E2E_TEST_USER_2: test-user-2
35+
E2E_APP_KEY: ${{ secrets.E2E_APP_KEY }}
36+
E2E_APP_SECRET: ${{ secrets.E2E_APP_SECRET }}
37+
E2E_TEST_USER_1_TOKEN: ${{ secrets.E2E_TEST_USER_1_TOKEN }}
38+
E2E_TEST_USER_2_TOKEN: ${{ secrets.E2E_TEST_USER_2_TOKEN }}
39+
E2E_ADDITIONAL_CHANNELS: mr-channel-1, mr-channel-2, edit-message-channel, pin-message-channel
40+
E2E_LONG_MESSAGE_LISTS_CHANNEL: navigate-long-message-lists
41+
E2E_ATTACHMENT_SIZING_CHANNEL: attachment-sizing
42+
43+
- name: 🎥 Upload Artifacts
44+
uses: actions/upload-artifact@v3
45+
if: ${{ always() }}
46+
with:
47+
name: E2E_Artifacts
48+
path: ./test-results
49+
retention-days: 1

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
> building chat applications.
99
1010
[![NPM](https://img.shields.io/npm/v/stream-chat-react.svg)](https://www.npmjs.com/package/stream-chat-react)
11-
[![build](https://github.com/GetStream/stream-chat-react/workflows/test/badge.svg)](https://github.com/GetStream/stream-chat-react/actions)
11+
[![build](https://github.com/GetStream/stream-chat-react/actions/workflows/ci.yml/badge.svg)](https://github.com/GetStream/stream-chat-react/actions)
1212
[![Component Reference](https://img.shields.io/badge/docs-component%20reference-blue.svg)](https://getstream.io/chat/docs/sdk/react/)
1313
[![codecov](https://codecov.io/gh/GetStream/stream-chat-react/branch/master/graph/badge.svg)](https://codecov.io/gh/GetStream/stream-chat-react)
1414

src/components/MML/__tests__/MML.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ describe('MML', () => {
4141
/>
4242
</div>
4343
`);
44-
});
44+
}, 10000);
4545

4646
it('should render a basic mml', async () => {
4747
const tree = await renderComponent({

0 commit comments

Comments
 (0)