Skip to content
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

Jump to bottom

refactor(test): don't use global as any in test utils #63241

Merged
merged 3 commits into from
Mar 20, 2024
Merged

refactor(test): don't use global as any in test utils #63241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
224bf13
refactor(test): expose test mode as re-exported variables
balazsorban44 Mar 13, 2024
3b50db3
refactor(test): don't use `global as any` in test utils
balazsorban44 Mar 13, 2024
b4c96b2
Merge branch 'canary' into 03-13-refactor_test_don_t_use_global_as_an…
balazsorban44 Mar 20, 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
16 changes: 8 additions & 8 deletions test/lib/e2e-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export function nextTestSetup(

if (options.skipDeployment) {
// When the environment is running for deployment tests.
if ((global as any).isNextDeploy) {
if (isNextDeploy) {
// eslint-disable-next-line jest/no-focused-tests
it.only('should skip next deploy', () => {})
// No tests are run.
Expand Down Expand Up @@ -281,22 +281,22 @@ export function nextTestSetup(
})

return {
get isNextDev(): boolean {
return Boolean((global as any).isNextDev)
get isNextDev() {
return isNextDev
},
get isTurbopack(): boolean {
return Boolean(
(global as any).isNextDev &&
isNextDev &&
!process.env.TEST_WASM &&
(options.turbo ?? shouldRunTurboDevTest())
)
},

get isNextDeploy(): boolean {
return Boolean((global as any).isNextDeploy)
get isNextDeploy() {
return isNextDeploy
},
get isNextStart(): boolean {
return Boolean((global as any).isNextStart)
get isNextStart() {
return isNextStart
},
get next() {
return nextProxy
Expand Down
15 changes: 6 additions & 9 deletions test/lib/next-modes/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import path from 'path'
import { existsSync, promises as fs } from 'fs'
import treeKill from 'tree-kill'
import type { NextConfig } from 'next'
import { FileRef } from '../e2e-utils'
import { FileRef, isNextDeploy, isNextDev } from '../e2e-utils'
import { ChildProcess } from 'child_process'
import { createNextInstall } from '../create-next-install'
import { Span } from 'next/src/trace'
Expand Down Expand Up @@ -75,7 +75,7 @@ export class NextInstance {

require('console').log('packageJson??', this.packageJson)

if (!(global as any).isNextDeploy) {
if (!isNextDeploy) {
this.env = {
...this.env,
// remove node_modules/.bin repo path from env
Expand Down Expand Up @@ -205,7 +205,7 @@ export class NextInstance {
!this.dependencies &&
!this.installCommand &&
!this.packageJson &&
!(global as any).isNextDeploy
!isNextDeploy
) {
await fs.cp(process.env.NEXT_TEST_STARTER, this.testDir, {
recursive: true,
Expand Down Expand Up @@ -244,10 +244,7 @@ export class NextInstance {
)
}

if (
this.nextConfig ||
((global as any).isNextDeploy && !nextConfigFile)
) {
if (this.nextConfig || (isNextDeploy && !nextConfigFile)) {
const functions = []
const exportDeclare =
this.packageJson?.type === 'module'
Expand Down Expand Up @@ -281,7 +278,7 @@ export class NextInstance {
)
}

if ((global as any).isNextDeploy) {
if (isNextDeploy) {
const fileName = path.join(
this.testDir,
nextConfigFile || 'next.config.js'
Expand Down Expand Up @@ -450,7 +447,7 @@ export class NextInstance {
// TODO: replace this with an event directly from WatchPack inside
// router-server for better accuracy
if (
(global as any).isNextDev &&
isNextDev &&
(filename.startsWith('app/') || filename.startsWith('pages/'))
) {
require('console').log('fs dev delay', filename)
Expand Down