Skip to content

Commit

Permalink
Remove Turbopack test skip for scss test (#63649)
Browse files Browse the repository at this point in the history
## What?

Verified this passes now with Turbopack in dev even.


<!-- Thanks for opening a PR! Your contribution is much appreciated.
To make sure your PR is handled as smoothly as possible we request that
you follow the checklist sections below.
Choose the right checklist for the change(s) that you're making:

## For Contributors

### Improving Documentation

- Run `pnpm prettier-fix` to fix formatting issues before opening the
PR.
- Read the Docs Contribution Guide to ensure your contribution follows
the docs guidelines:
https://nextjs.org/docs/community/contribution-guide

### Adding or Updating Examples

- The "examples guidelines" are followed from our contributing doc
https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md
- Make sure the linting passes by running `pnpm build && pnpm lint`. See
https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md

### Fixing a bug

- Related issues linked using `fixes #number`
- Tests added. See:
https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md

### Adding a feature

- Implements an existing feature request or RFC. Make sure the feature
request has been accepted for implementation before opening a PR. (A
discussion must be opened, see
https://github.com/vercel/next.js/discussions/new?category=ideas)
- Related issues/discussions are linked using `fixes #number`
- e2e tests added
(https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs)
- Documentation added
- Telemetry added. In case of a feature if it's used or not.
- Errors have a helpful link attached, see
https://github.com/vercel/next.js/blob/canary/contributing.md


## For Maintainers

- Minimal description (aim for explaining to someone not on the team to
understand the PR)
- When linking to a Slack thread, you might want to share details of the
conclusion
- Link both the Linear (Fixes NEXT-xxx) and the GitHub issues
- Add review comments if necessary to explain to the reviewer the logic
behind a change

### What?

### Why?

### How?

Closes NEXT-
Fixes #

-->


Closes NEXT-2907
  • Loading branch information
timneutkens authored Mar 24, 2024
1 parent 2746990 commit da1b259
Show file tree
Hide file tree
Showing 2 changed files with 70 additions and 74 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,13 @@ describe('Dynamic Route CSS Module Usage', () => {
sass: '1.54.0',
},
})
;(process.env.TURBOPACK ? describe.skip : describe)('production mode', () => {
it('should apply styles correctly', async () => {
const browser = await next.browser('/post-1')
it('should apply styles correctly', async () => {
const browser = await next.browser('/post-1')

const background = await browser
.elementByCss('#my-div')
.getComputedCss('background-color')
const background = await browser
.elementByCss('#my-div')
.getComputedCss('background-color')

expect(background).toMatch(colorToRgb('red'))
})
expect(background).toMatch(colorToRgb('red'))
})
})
130 changes: 64 additions & 66 deletions test/production/graceful-shutdown/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,86 +33,84 @@ describe('Graceful Shutdown', () => {

runTests(true)
})
;(process.env.TURBOPACK ? describe.skip : describe)(
'production (next start)',
() => {
beforeAll(async () => {
await nextBuild(appDir)
})
beforeEach(async () => {
appPort = await findPort()
app = await nextStart(appDir, appPort)
})
afterEach(() => killApp(app))
;(process.env.TURBOPACK && !process.env.TURBOPACK_BUILD
? describe.skip
: describe)('production (next start)', () => {
beforeAll(async () => {
await nextBuild(appDir)
})
beforeEach(async () => {
appPort = await findPort()
app = await nextStart(appDir, appPort)
})
afterEach(() => killApp(app))

runTests()
runTests()
})
;(process.env.TURBOPACK && !process.env.TURBOPACK_BUILD
? describe.skip
: describe)('production (standalone mode)', () => {
let next: NextInstance
let serverFile

const projectFiles = {
'next.config.mjs': `export default { output: 'standalone' }`,
}
)
;(process.env.TURBOPACK ? describe.skip : describe)(
'production (standalone mode)',
() => {
let next: NextInstance
let serverFile

const projectFiles = {
'next.config.mjs': `export default { output: 'standalone' }`,
}

for (const file of glob.sync('*', { cwd: appDir, dot: false })) {
projectFiles[file] = new FileRef(join(appDir, file))
}
for (const file of glob.sync('*', { cwd: appDir, dot: false })) {
projectFiles[file] = new FileRef(join(appDir, file))
}

beforeAll(async () => {
next = await createNext({
files: projectFiles,
dependencies: {
swr: 'latest',
},
})
beforeAll(async () => {
next = await createNext({
files: projectFiles,
dependencies: {
swr: 'latest',
},
})

await next.stop()
await next.stop()

await fs.move(
join(next.testDir, '.next/standalone'),
join(next.testDir, 'standalone')
)
await fs.move(
join(next.testDir, '.next/standalone'),
join(next.testDir, 'standalone')
)

for (const file of await fs.readdir(next.testDir)) {
if (file !== 'standalone') {
await fs.remove(join(next.testDir, file))
}
for (const file of await fs.readdir(next.testDir)) {
if (file !== 'standalone') {
await fs.remove(join(next.testDir, file))
}
const files = glob.sync('**/*', {
cwd: join(next.testDir, 'standalone/.next/server/pages'),
dot: true,
})
}
const files = glob.sync('**/*', {
cwd: join(next.testDir, 'standalone/.next/server/pages'),
dot: true,
})

for (const file of files) {
if (file.endsWith('.json') || file.endsWith('.html')) {
await fs.remove(join(next.testDir, '.next/server', file))
}
for (const file of files) {
if (file.endsWith('.json') || file.endsWith('.html')) {
await fs.remove(join(next.testDir, '.next/server', file))
}
}

serverFile = join(next.testDir, 'standalone/server.js')
})
serverFile = join(next.testDir, 'standalone/server.js')
})

beforeEach(async () => {
appPort = await findPort()
app = await initNextServerScript(
serverFile,
/- Local:/,
{ ...process.env, PORT: appPort.toString() },
undefined,
{ cwd: next.testDir }
)
})
afterEach(() => killApp(app))
beforeEach(async () => {
appPort = await findPort()
app = await initNextServerScript(
serverFile,
/- Local:/,
{ ...process.env, PORT: appPort.toString() },
undefined,
{ cwd: next.testDir }
)
})
afterEach(() => killApp(app))

afterAll(() => next.destroy())
afterAll(() => next.destroy())

runTests()
}
)
runTests()
})
})

function runTests(dev = false) {
Expand Down

0 comments on commit da1b259

Please sign in to comment.