Skip to content

test: Refactor utils into @sentry-internal/test-utils #12277

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

Merged
merged 8 commits into from
May 31, 2024
Merged

test: Refactor utils into @sentry-internal/test-utils #12277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3eafd31
ref: Refactor utils into `@sentry-internal/test-utils`
mydea May 29, 2024
3672159
remove wait-port
mydea May 29, 2024
956f1e2
add as devdep
mydea May 29, 2024
4db5c33
hardcode for angular
mydea May 29, 2024
1af377c
fix config
mydea May 29, 2024
cac212e
test adjustments
mydea May 29, 2024
75a0889
fixes...
mydea May 29, 2024
f81af6e
fix hapi test
mydea May 31, 2024
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
2 changes: 1 addition & 1 deletion .github/workflows/canary.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ env:

CACHED_BUILD_PATHS: |
${{ github.workspace }}/packages/*/*.tgz
${{ github.workspace }}/dev-packages/event-proxy-server/build
${{ github.workspace }}/dev-packages/test-utils/build
${{ github.workspace }}/node_modules
${{ github.workspace }}/packages/*/node_modules
${{ github.workspace }}/dev-packages/*/node_modules
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/browser-integration-tests/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
},
"dependencies": {
"@babel/preset-typescript": "^7.16.7",
"@playwright/test": "^1.43.1",
"@playwright/test": "^1.44.1",
"@sentry-internal/rrweb": "2.11.0",
"@sentry/browser": "8.7.0",
"axios": "1.6.7",
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/angular-17/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
"zone.js": "~0.14.3"
},
"devDependencies": {
"@sentry-internal/event-proxy-server": "link:../../../event-proxy-server",
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@angular-devkit/build-angular": "^17.1.1",
"@angular/cli": "^17.1.1",
"@angular/compiler-cli": "^17.1.0",
"@playwright/test": "^1.41.1",
"@types/jasmine": "~5.1.0",
"http-server": "^14.1.1",
"jasmine-core": "~5.1.0",
Expand All @@ -42,8 +42,7 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.3.2",
"wait-port": "1.0.4"
"typescript": "~5.3.2"
},
"volta": {
"extends": "../../package.json"
Expand Down
8 changes: 8 additions & 0 deletions dev-packages/e2e-tests/test-applications/angular-17/playwright.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { getPlaywrightConfig } from '@sentry-internal/test-utils';

const config = getPlaywrightConfig({
startCommand: `pnpm preview`,
port: 8080,
});

export default config;
72 changes: 0 additions & 72 deletions dev-packages/e2e-tests/test-applications/angular-17/playwright.config.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-17/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { appConfig } from './app/app.config';
import * as Sentry from '@sentry/angular';

Sentry.init({
// Cannot use process.env here, so we hardcode the DSN
dsn: 'https://3b6c388182fb435097f41d181be2b2ba@o4504321058471936.ingest.sentry.io/4504321066008576',
tracesSampleRate: 1.0,
integrations: [Sentry.browserTracingIntegration({})],
tunnel: `http://localhost:3031/`, // proxy server
debug: true,
});

bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err));
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-17/start-event-proxy.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { startEventProxyServer } from '@sentry-internal/event-proxy-server';
import { startEventProxyServer } from '@sentry-internal/test-utils';

startEventProxyServer({
port: 3031,
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-17/tests/errors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { waitForError, waitForTransaction } from '@sentry-internal/event-proxy-server';
import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';

test('sends an error', async ({ page }) => {
const errorPromise = waitForError('angular-17', async errorEvent => {
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-17/tests/performance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/event-proxy-server';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';

test('sends a pageload transaction with a parameterized URL', async ({ page }) => {
Expand Down
7 changes: 3 additions & 4 deletions dev-packages/e2e-tests/test-applications/angular-18/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@
"zone.js": "~0.14.3"
},
"devDependencies": {
"@sentry-internal/event-proxy-server": "link:../../../event-proxy-server",
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@angular-devkit/build-angular": "^18.0.0",
"@angular/cli": "^18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@playwright/test": "^1.41.1",
"@types/jasmine": "~5.1.0",
"http-server": "^14.1.1",
"jasmine-core": "~5.1.0",
Expand All @@ -42,8 +42,7 @@
"karma-coverage": "~2.2.0",
"karma-jasmine": "~5.1.0",
"karma-jasmine-html-reporter": "~2.1.0",
"typescript": "~5.4.5",
"wait-port": "1.0.4"
"typescript": "~5.4.5"
},
"volta": {
"extends": "../../package.json"
Expand Down
8 changes: 8 additions & 0 deletions dev-packages/e2e-tests/test-applications/angular-18/playwright.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import { getPlaywrightConfig } from '@sentry-internal/test-utils';

const config = getPlaywrightConfig({
startCommand: `pnpm preview`,
port: 8080,
});

export default config;
72 changes: 0 additions & 72 deletions dev-packages/e2e-tests/test-applications/angular-18/playwright.config.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-18/src/main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import { appConfig } from './app/app.config';
import * as Sentry from '@sentry/angular';

Sentry.init({
// Cannot use process.env here, so we hardcode the DSN
dsn: 'https://3b6c388182fb435097f41d181be2b2ba@o4504321058471936.ingest.sentry.io/4504321066008576',
tracesSampleRate: 1.0,
integrations: [Sentry.browserTracingIntegration({})],
tunnel: `http://localhost:3031/`, // proxy server
debug: true,
});

bootstrapApplication(AppComponent, appConfig).catch(err => console.error(err));
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-18/start-event-proxy.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { startEventProxyServer } from '@sentry-internal/event-proxy-server';
import { startEventProxyServer } from '@sentry-internal/test-utils';

startEventProxyServer({
port: 3031,
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-18/tests/errors.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { waitForError, waitForTransaction } from '@sentry-internal/event-proxy-server';
import { waitForError, waitForTransaction } from '@sentry-internal/test-utils';

test('sends an error', async ({ page }) => {
const errorPromise = waitForError('angular-18', async errorEvent => {
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/angular-18/tests/performance.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { expect, test } from '@playwright/test';
import { waitForTransaction } from '@sentry-internal/event-proxy-server';
import { waitForTransaction } from '@sentry-internal/test-utils';
import { SEMANTIC_ATTRIBUTE_SENTRY_OP, SEMANTIC_ATTRIBUTE_SENTRY_ORIGIN } from '@sentry/core';

test('sends a pageload transaction with a parameterized URL', async ({ page }) => {
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/e2e-tests/test-applications/create-next-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"typescript": "4.9.5"
},
"devDependencies": {
"@playwright/test": "^1.27.1"
"@playwright/test": "^1.44.1"
},
"volta": {
"extends": "../../package.json"
Expand Down
4 changes: 2 additions & 2 deletions dev-packages/e2e-tests/test-applications/create-remix-app-express-vite-dev/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
"react-dom": "^18.2.0"
},
"devDependencies": {
"@sentry-internal/event-proxy-server": "link:../../../event-proxy-server",
"@playwright/test": "^1.36.2",
"@playwright/test": "^1.44.1",
"@sentry-internal/test-utils": "link:../../../test-utils",
"@remix-run/dev": "^2.7.2",
"@sentry/types": "latest || *",
"@sentry/utils": "latest || *",
Expand Down
7 changes: 7 additions & 0 deletions ...kages/e2e-tests/test-applications/create-remix-app-express-vite-dev/playwright.config.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { getPlaywrightConfig } from '@sentry-internal/test-utils';

const config = getPlaywrightConfig({
startCommand: `pnpm dev`,
});

export default config;
66 changes: 0 additions & 66 deletions ...ckages/e2e-tests/test-applications/create-remix-app-express-vite-dev/playwright.config.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...kages/e2e-tests/test-applications/create-remix-app-express-vite-dev/start-event-proxy.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { startEventProxyServer } from '@sentry-internal/event-proxy-server';
import { startEventProxyServer } from '@sentry-internal/test-utils';

startEventProxyServer({
port: 3031,
Expand Down
Loading