Skip to content

Commit

Permalink
Exclude integration tests from eslint/prettier
Browse files Browse the repository at this point in the history
  • Loading branch information
kamilogorek committed Jun 1, 2021
1 parent 3ad9fec commit 7ac9d4c
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/nextjs/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
ecmaVersion: 2018,
},
extends: ['@sentry-internal/sdk'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**'],
ignorePatterns: ['build/**', 'dist/**', 'esm/**', 'examples/**', 'scripts/**', 'test/integration/**'],
overrides: [
{
files: ['*.ts', '*.tsx', '*.d.ts'],
Expand Down
1 change: 1 addition & 0 deletions packages/nextjs/.prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
test/integration
2 changes: 2 additions & 0 deletions packages/nextjs/src/performance/client.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */

import { Primitive, Transaction, TransactionContext } from '@sentry/types';
import { fill, getGlobalObject, stripUrlQueryAndFragment } from '@sentry/utils';
import { default as Router } from 'next/router';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const { expectRequestCount, expectTransaction, isTransactionRequest } = require('../utils');
const { expectRequestCount, expectTransaction, isTransactionRequest, sleep } = require('../utils');

module.exports = async ({ page, url, requests }) => {
await page.goto(`${url}/healthy`);
Expand All @@ -14,6 +14,7 @@ module.exports = async ({ page, url, requests }) => {
},
});

await sleep(100);
await page.click('a#alsoHealthy');
await page.waitForRequest(isTransactionRequest);

Expand All @@ -30,6 +31,7 @@ module.exports = async ({ page, url, requests }) => {
},
});

await sleep(100);
await page.click('a#healthy');
await page.waitForRequest(isTransactionRequest);

Expand Down
2 changes: 1 addition & 1 deletion scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ elif [[ "$(cut -d. -f1 <<<"$NODE_VERSION")" -le 8 ]]; then
cd ../..

# ember tests happen separately, and the rest fail on node 8 for various syntax or dependency reasons
yarn test --ignore="@sentry/ember" --ignore="@sentry-internal/eslint-plugin-sdk" --ignore="@sentry/react" --ignore="@sentry/wasm" --ignore="@sentry/gatsby" --ignore="@sentry/serverless"
yarn test --ignore="@sentry/ember" --ignore="@sentry-internal/eslint-plugin-sdk" --ignore="@sentry/react" --ignore="@sentry/wasm" --ignore="@sentry/gatsby" --ignore="@sentry/serverless" --ignore="@sentry/nextjs"

else
yarn test --ignore="@sentry/ember"
Expand Down

0 comments on commit 7ac9d4c

Please sign in to comment.