Skip to content

Commit 795839c

Browse files
authored
Merge pull request #5085 from Tyriar/addon_tests
Run other integration tests in CI
2 parents cae6fa0 + a1b2a1c commit 795839c

File tree

18 files changed

+51
-21
lines changed

18 files changed

+51
-21
lines changed

.github/workflows/ci.yml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,26 @@ jobs:
192192
run: yarn build-demo
193193
- name: Integration tests (core) # Tests use 50% workers to reduce flakiness
194194
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=core
195+
- name: Integration tests (addon-attach)
196+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-attach
195197
- name: Integration tests (addon-canvas)
196198
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-canvas
199+
- name: Integration tests (addon-clipboard)
200+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-clipboard
201+
- name: Integration tests (addon-fit)
202+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-fit
203+
- name: Integration tests (addon-image)
204+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-image
205+
- name: Integration tests (addon-search)
206+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-search
207+
- name: Integration tests (addon-serialize)
208+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-serialize
209+
- name: Integration tests (addon-unicode-graphemes)
210+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-unicode-graphemes
211+
- name: Integration tests (addon-unicode11)
212+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-unicode11
213+
- name: Integration tests (addon-web-links)
214+
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-web-links
197215
- name: Integration tests (addon-webgl)
198216
run: yarn test-integration-${{ matrix.browser }} --workers=50% --forbid-only --suite=addon-webgl
199217

addons/addon-attach/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"build": "../../node_modules/.bin/tsc -p .",
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
21-
"prepublishOnly": "npm run package"
21+
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only"
2223
},
2324
"peerDependencies": {
2425
"@xterm/xterm": "^5.0.0"

addons/addon-clipboard/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"build": "../../node_modules/.bin/tsc -p .",
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
21-
"prepublishOnly": "npm run package"
21+
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only"
2223
},
2324
"peerDependencies": {
2425
"@xterm/xterm": "^5.4.0"

addons/addon-fit/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"build": "../../node_modules/.bin/tsc -p .",
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
21-
"prepublishOnly": "npm run package"
21+
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only"
2223
},
2324
"peerDependencies": {
2425
"@xterm/xterm": "^5.0.0"

addons/addon-image/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
"scripts": {
2020
"prepackage": "../../node_modules/.bin/tsc -p .",
2121
"package": "../../node_modules/.bin/webpack",
22-
"prepublishOnly": "npm run package"
22+
"prepublishOnly": "npm run package",
23+
"start-server-only": "node ../../demo/start-server-only"
2324
},
2425
"peerDependencies": {
2526
"@xterm/xterm": "^5.2.0"

addons/addon-image/test/ImageAddon.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ const TESTDATA_IIP: [string, [number, number]][] = [
6161
let ctx: ITestContext;
6262
test.beforeAll(async ({ browser }) => {
6363
ctx = await createTestContext(browser);
64-
await openTerminal(ctx);
64+
await openTerminal(ctx, { cols: 80, rows: 24 });
6565
});
6666
test.afterAll(async () => await ctx.page.close());
6767

addons/addon-image/test/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const config: PlaywrightTestConfig = {
55
timeout: 10000,
66
projects: [
77
{
8-
name: 'Chrome Stable',
8+
name: 'ChromeStable',
99
use: {
1010
browserName: 'chromium',
1111
channel: 'chrome'
1212
}
1313
},
1414
{
15-
name: 'Firefox Stable',
15+
name: 'FirefoxStable',
1616
use: {
1717
browserName: 'firefox'
1818
}

addons/addon-search/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"scripts": {
1818
"prepackage": "../../node_modules/.bin/tsc -p .",
1919
"package": "../../node_modules/.bin/webpack",
20-
"prepublishOnly": "npm run package"
20+
"prepublishOnly": "npm run package",
21+
"start-server-only": "node ../../demo/start-server-only"
2122
},
2223
"peerDependencies": {
2324
"@xterm/xterm": "^5.0.0"

addons/addon-search/test/SearchAddon.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import { ITestContext, createTestContext, openTerminal, timeout } from '../../..
1212
let ctx: ITestContext;
1313
test.beforeAll(async ({ browser }) => {
1414
ctx = await createTestContext(browser);
15-
await openTerminal(ctx);
15+
await openTerminal(ctx, { cols: 80, rows: 24 });
1616
});
1717
test.afterAll(async () => await ctx.page.close());
1818

@@ -390,6 +390,9 @@ test.describe('Search Tests', () => {
390390
let fixture: string;
391391
test.beforeAll(async () => {
392392
fixture = (await new Promise<Buffer>(r => readFile(resolve(__dirname, '../fixtures/issue-2444'), (err, data) => r(data)))).toString();
393+
if (process.platform !== 'win32') {
394+
fixture = fixture.replace(/\n/g, '\n\r');
395+
}
393396
});
394397
test('should find all occurrences using findNext', async () => {
395398
await ctx.proxy.write(fixture);

addons/addon-search/test/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const config: PlaywrightTestConfig = {
55
timeout: 10000,
66
projects: [
77
{
8-
name: 'Chrome Stable',
8+
name: 'ChromeStable',
99
use: {
1010
browserName: 'chromium',
1111
channel: 'chrome'
1212
}
1313
},
1414
{
15-
name: 'Firefox Stable',
15+
name: 'FirefoxStable',
1616
use: {
1717
browserName: 'firefox'
1818
}

addons/addon-serialize/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
2121
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only",
2223
"benchmark": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json",
2324
"benchmark-baseline": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js",
2425
"benchmark-eval": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js"

addons/addon-serialize/test/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const config: PlaywrightTestConfig = {
55
timeout: 10000,
66
projects: [
77
{
8-
name: 'Chrome Stable',
8+
name: 'ChromeStable',
99
use: {
1010
browserName: 'chromium',
1111
channel: 'chrome'
1212
}
1313
},
1414
{
15-
name: 'Firefox Stable',
15+
name: 'FirefoxStable',
1616
use: {
1717
browserName: 'firefox'
1818
}

addons/addon-unicode-graphemes/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
2121
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only",
2223
"benchmark": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json out-benchmark/benchmark/*benchmark.js",
2324
"benchmark-baseline": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --baseline out-benchmark/benchmark/*benchmark.js",
2425
"benchmark-eval": "NODE_PATH=../../out:./out:./out-benchmark/ ../../node_modules/.bin/xterm-benchmark -r 5 -c benchmark/benchmark.json --eval out-benchmark/benchmark/*benchmark.js"

addons/addon-unicode-graphemes/test/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const config: PlaywrightTestConfig = {
55
timeout: 10000,
66
projects: [
77
{
8-
name: 'Chrome Stable',
8+
name: 'ChromeStable',
99
use: {
1010
browserName: 'chromium',
1111
channel: 'chrome'
1212
}
1313
},
1414
{
15-
name: 'Firefox Stable',
15+
name: 'FirefoxStable',
1616
use: {
1717
browserName: 'firefox'
1818
}

addons/addon-unicode11/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"build": "../../node_modules/.bin/tsc -p .",
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
21-
"prepublishOnly": "npm run package"
21+
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only"
2223
},
2324
"peerDependencies": {
2425
"@xterm/xterm": "^5.0.0"

addons/addon-unicode11/test/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const config: PlaywrightTestConfig = {
55
timeout: 10000,
66
projects: [
77
{
8-
name: 'Chrome Stable',
8+
name: 'ChromeStable',
99
use: {
1010
browserName: 'chromium',
1111
channel: 'chrome'
1212
}
1313
},
1414
{
15-
name: 'Firefox Stable',
15+
name: 'FirefoxStable',
1616
use: {
1717
browserName: 'firefox'
1818
}

addons/addon-web-links/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@
1818
"build": "../../node_modules/.bin/tsc -p .",
1919
"prepackage": "npm run build",
2020
"package": "../../node_modules/.bin/webpack",
21-
"prepublishOnly": "npm run package"
21+
"prepublishOnly": "npm run package",
22+
"start-server-only": "node ../../demo/start-server-only"
2223
},
2324
"peerDependencies": {
2425
"@xterm/xterm": "^5.0.0"

addons/addon-web-links/test/playwright.config.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ const config: PlaywrightTestConfig = {
55
timeout: 10000,
66
projects: [
77
{
8-
name: 'Chrome Stable',
8+
name: 'ChromeStable',
99
use: {
1010
browserName: 'chromium',
1111
channel: 'chrome'
1212
}
1313
},
1414
{
15-
name: 'Firefox Stable',
15+
name: 'FirefoxStable',
1616
use: {
1717
browserName: 'firefox'
1818
}

0 commit comments

Comments
 (0)