-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'develop' into timfish/fix/dont-overwrite-local-variables
- Loading branch information
Showing
72 changed files
with
623 additions
and
255 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| name: "Automation: Update GH Project" | ||
| on: | ||
| pull_request: | ||
| types: | ||
| - closed | ||
| - opened | ||
| - reopened | ||
| - ready_for_review | ||
| - converted_to_draft | ||
|
|
||
| jobs: | ||
| # Check if PR is in project | ||
| check_project: | ||
| name: Check if PR is in project | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Check if PR is in project | ||
| continue-on-error: true | ||
| id: check_project | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| operation: read | ||
|
|
||
| - name: If project field is read, set is_in_project to 1 | ||
| if: steps.check_project.outputs.field_read_value | ||
| id: is_in_project | ||
| run: echo "is_in_project=1" >> "$GITHUB_OUTPUT" | ||
|
|
||
| outputs: | ||
| is_in_project: ${{ steps.is_in_project.outputs.is_in_project || '0' }} | ||
|
|
||
| # When a PR is a draft, it should go into "In Progress" | ||
| mark_as_in_progress: | ||
| name: "Mark as In Progress" | ||
| needs: check_project | ||
| if: | | ||
| needs.check_project.outputs.is_in_project == '1' | ||
| && (github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'converted_to_draft') | ||
| && github.event.pull_request.draft == true | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Update status to in_progress | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| value: "🏗 In Progress" | ||
|
|
||
| # When a PR is not a draft, it should go into "In Review" | ||
| mark_as_in_review: | ||
| name: "Mark as In Review" | ||
| needs: check_project | ||
| if: | | ||
| needs.check_project.outputs.is_in_project == '1' | ||
| && (github.event.action == 'opened' || github.event.action == 'reopened' || github.event.action == 'ready_for_review') | ||
| && github.event.pull_request.draft == false | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Update status to in_review | ||
| id: update_status | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| value: "👀 In Review" | ||
|
|
||
| # By default, closed PRs go into "Ready for Release" | ||
| # But if they are closed without merging, they should go into "Done" | ||
| mark_as_done: | ||
| name: "Mark as Done" | ||
| needs: check_project | ||
| if: | | ||
| needs.check_project.outputs.is_in_project == '1' | ||
| && github.event.action == 'closed' && github.event.pull_request.merged == false | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Update status to done | ||
| id: update_status | ||
| uses: github/update-project-action@f980378bc179626af5b4e20ec05ec39c7f7a6f6d | ||
| with: | ||
| github_token: ${{ secrets.GH_PROJECT_AUTOMATION }} | ||
| organization: getsentry | ||
| project_number: 31 | ||
| content_id: ${{ github.event.pull_request.node_id }} | ||
| field: Status | ||
| value: "✅ Done" | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 0 additions & 31 deletions
31
dev-packages/e2e-tests/test-applications/nuxt-3/tests/performance.client.test.ts
This file was deleted.
Oops, something went wrong.
57 changes: 57 additions & 0 deletions
57
dev-packages/e2e-tests/test-applications/nuxt-3/tests/tracing.client.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| import { expect, test } from '@nuxt/test-utils/playwright'; | ||
| import { waitForTransaction } from '@sentry-internal/test-utils'; | ||
| import type { Span } from '@sentry/nuxt'; | ||
|
|
||
| test('sends a pageload root span with a parameterized URL', async ({ page }) => { | ||
| const transactionPromise = waitForTransaction('nuxt-3', async transactionEvent => { | ||
| return transactionEvent.transaction === '/test-param/:param()'; | ||
| }); | ||
|
|
||
| await page.goto(`/test-param/1234`); | ||
|
|
||
| const rootSpan = await transactionPromise; | ||
|
|
||
| expect(rootSpan).toMatchObject({ | ||
| contexts: { | ||
| trace: { | ||
| data: { | ||
| 'sentry.source': 'route', | ||
| 'sentry.origin': 'auto.pageload.vue', | ||
| 'sentry.op': 'pageload', | ||
| 'params.param': '1234', | ||
| }, | ||
| op: 'pageload', | ||
| origin: 'auto.pageload.vue', | ||
| }, | ||
| }, | ||
| transaction: '/test-param/:param()', | ||
| transaction_info: { | ||
| source: 'route', | ||
| }, | ||
| }); | ||
| }); | ||
|
|
||
| test('sends component tracking spans when `trackComponents` is enabled', async ({ page }) => { | ||
| const transactionPromise = waitForTransaction('nuxt-3', async transactionEvent => { | ||
| return transactionEvent.transaction === '/client-error'; | ||
| }); | ||
|
|
||
| await page.goto(`/client-error`); | ||
|
|
||
| const rootSpan = await transactionPromise; | ||
| const errorButtonSpan = rootSpan.spans.find((span: Span) => span.description === 'Vue <ErrorButton>'); | ||
|
|
||
| const expected = { | ||
| data: { 'sentry.origin': 'auto.ui.vue', 'sentry.op': 'ui.vue.mount' }, | ||
| description: 'Vue <ErrorButton>', | ||
| op: 'ui.vue.mount', | ||
| parent_span_id: expect.any(String), | ||
| span_id: expect.any(String), | ||
| start_timestamp: expect.any(Number), | ||
| timestamp: expect.any(Number), | ||
| trace_id: expect.any(String), | ||
| origin: 'auto.ui.vue', | ||
| }; | ||
|
|
||
| expect(errorButtonSpan).toMatchObject(expected); | ||
| }); |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.