Skip to content

Commit

Permalink
fix broken create-next-app tests (#63019)
Browse files Browse the repository at this point in the history
#62980 migrated `examples/basic-css` to use app router. A handful of our
create-next-app tests use this example when asserting the correct
project files are created, so we were asserting on a pages file existing
rather than an app dir page. This PR updates those tests.

<!-- 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-2754
  • Loading branch information
ztanner committed Mar 19, 2024
1 parent 81114f3 commit 4804982
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 13 deletions.
6 changes: 5 additions & 1 deletion scripts/run-for-change.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ const CHANGE_ITEM_GROUPS = {
'packages/next-env/README.md',
],
'deploy-examples': ['examples/image-component'],
cna: ['packages/create-next-app', 'test/integration/create-next-app'],
cna: [
'packages/create-next-app',
'test/integration/create-next-app',
'examples/basic-css',
],
'next-codemod': ['packages/next-codemod'],
'next-swc': [
'packages/next-swc',
Expand Down
12 changes: 8 additions & 4 deletions test/integration/create-next-app/index.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ describe('create next app', () => {
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'node_modules/next',
],
Expand Down Expand Up @@ -196,7 +197,8 @@ describe('create next app', () => {
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'node_modules/next',
],
Expand Down Expand Up @@ -260,7 +262,8 @@ describe('create next app', () => {
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'node_modules/react',
],
Expand Down Expand Up @@ -293,7 +296,8 @@ describe('create next app', () => {
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'node_modules/react',
],
Expand Down
24 changes: 16 additions & 8 deletions test/integration/create-next-app/package-manager.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,8 @@ it('should use npm as the package manager on supplying --use-npm with example',
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'package-lock.json',
'node_modules/next',
Expand Down Expand Up @@ -168,7 +169,8 @@ it('should use Yarn as the package manager on supplying --use-yarn with example'
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'yarn.lock',
'node_modules/next',
Expand Down Expand Up @@ -246,7 +248,8 @@ it('should use pnpm as the package manager on supplying --use-pnpm with example'
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'pnpm-lock.yaml',
'node_modules/next',
Expand Down Expand Up @@ -320,7 +323,8 @@ it('should use Bun as the package manager on supplying --use-bun with example',
projectName,
files: [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'bun.lockb',
'node_modules/next',
Expand Down Expand Up @@ -379,7 +383,8 @@ it('should infer npm as the package manager with example', async () => {

const files = [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'package-lock.json',
'node_modules/next',
Expand Down Expand Up @@ -462,7 +467,8 @@ it('should infer yarn as the package manager with example', async () => {

const files = [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'yarn.lock',
'node_modules/next',
Expand Down Expand Up @@ -545,7 +551,8 @@ it('should infer pnpm as the package manager with example', async () => {

const files = [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'pnpm-lock.yaml',
'node_modules/next',
Expand Down Expand Up @@ -620,7 +627,8 @@ it('should infer Bun as the package manager with example', async () => {

const files = [
'package.json',
'pages/index.tsx',
'app/page.tsx',
'app/layout.tsx',
'.gitignore',
'bun.lockb',
'node_modules/next',
Expand Down

0 comments on commit 4804982

Please sign in to comment.