Skip to content

Commit 6e65591

Browse files
authored
Fix cli v3 e2e suite issues (#1207)
* Fix resolve-legacy-peer-deps when PM=pnpm * Fix setup/teardown * Fix skip test before installing dependencies * Re-enable e2e suite in CI * Add changeset
1 parent 6293290 commit 6e65591

File tree

5 files changed

+20
-23
lines changed

5 files changed

+20
-23
lines changed

.changeset/young-jars-wait.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"trigger.dev": patch
3+
---
4+
5+
Fix various e2e issues for 'resolve-legacy-peer-deps' fixture, installation of fixture deps and lockfile-based test skipping'

.github/workflows/publish.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ jobs:
4949
uses: ./.github/workflows/unit-tests.yml
5050
secrets: inherit
5151

52-
# e2e:
53-
# uses: ./.github/workflows/e2e.yml
54-
# with:
55-
# package: cli-v3
56-
# secrets: inherit
52+
e2e:
53+
uses: ./.github/workflows/e2e.yml
54+
with:
55+
package: cli-v3
56+
secrets: inherit
5757

5858
publish:
5959
needs: [typecheck, units]
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,4 @@
1+
# Configure npm to ignore peer deps upon install
12
legacy-peer-deps=true
3+
# Configure pnpm to ignore peer deps upon install
4+
auto-install-peers=false

packages/cli-v3/e2e/fixtures/resolve-legacy-peer-deps/pnpm-lock.yaml

Lines changed: 1 addition & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/cli-v3/e2e/index.test.ts

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ logger.loggerLevel = options.logLevel;
4949

5050
if (testCases.length > 0) {
5151
describe.concurrent("bundling", async () => {
52-
beforeEach<E2EFixtureTest>(async ({ dir, packageManager }) => {
53-
await rimraf(join(dir, "**/node_modules"), {
52+
beforeEach<E2EFixtureTest>(async ({ dir, packageManager, skip }) => {
53+
await rimraf(join(dir, "**/node_modules/**"), {
5454
glob: true,
5555
});
5656
await rimraf(join(dir, ".yarn"), { glob: true });
@@ -67,6 +67,10 @@ if (testCases.length > 0) {
6767
}
6868
}
6969

70+
if (options.packageManager && !existsSync(resolve(dir, LOCKFILES[options.packageManager]))) {
71+
skip();
72+
}
73+
7074
await installFixtureDeps(dir, packageManager);
7175
}, TIMEOUT);
7276

@@ -100,7 +104,6 @@ if (testCases.length > 0) {
100104
dir,
101105
packageManager,
102106
resolveEnv,
103-
skip,
104107
skipTypecheck,
105108
tempDir,
106109
wantCompilationError,
@@ -110,13 +113,6 @@ if (testCases.length > 0) {
110113
wantInstallationError,
111114
wantWorkerError,
112115
}) => {
113-
if (
114-
options.packageManager &&
115-
!existsSync(resolve(dir, LOCKFILES[options.packageManager]))
116-
) {
117-
skip();
118-
}
119-
120116
let resolvedConfig: ReadConfigResult;
121117
const configExpect = expect(
122118
(async () => {

0 commit comments

Comments
 (0)