Skip to content

Commit

Permalink
chore(misc): fix e2e tests
Browse files Browse the repository at this point in the history
  • Loading branch information
@jaysoo
jaysoo committed May 1, 2024
1 parent 6c78231 commit 84a4173
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 25 deletions.
4 changes: 2 additions & 2 deletions e2e/cypress/src/cypress.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,10 @@ export default defineConfig({
async () => {
const appName = uniq('next-cy-app');
runCLI(
`generate @nx/next:app ${appName} --e2eTestRunner=none --no-interactive`
`generate @nx/next:app ${appName} --directory=apps/${appName} --e2eTestRunner=none --no-interactive --projectNameAndRootFormat=as-provided`
);
runCLI(
`generate @nx/next:component btn --project=${appName} --no-interactive`
`generate @nx/next:component btn --project=${appName} --directory=apps/${appName}/components --nameAndDirectoryFormat=as-provided --no-interactive`
);
runCLI(
`generate @nx/next:cypress-component-configuration --project=${appName} --generate-tests --no-interactive`
Expand Down
4 changes: 2 additions & 2 deletions e2e/next/src/next-component-tests.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ function addBabelSupport(path: string) {

function createAppWithCt(appName: string) {
runCLI(
`generate @nx/next:app ${appName} --no-interactive --appDir=false --src=false`
`generate @nx/next:app ${appName} --directory=apps/${appName} --no-interactive --appDir=false --src=false --projectNameAndRootFormat=as-provided`
);
runCLI(
`generate @nx/next:component button --project=${appName} --directory=components --flat --no-interactive`
`generate @nx/next:component button --project=${appName} --directory=apps/${appName}/components --nameAndDirectoryFormat=as-provided --no-interactive`
);
createFile(
`apps/${appName}/public/data.json`,
Expand Down
4 changes: 2 additions & 2 deletions e2e/web/src/web-legacy.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -244,15 +244,15 @@ describe('index.html interpolation (legacy)', () => {
</head>
<body>
<div id='root'></div>
<div>Nx Variable: %NX_VARIABLE%</div>
<div>Nx Variable: %NX_PUBLIC_VARIABLE%</div>
<div>Some other variable: %SOME_OTHER_VARIABLE%</div>
<div>Deploy Url: %DEPLOY_URL%</div>
</body>
</html>
`;
const envFilePath = `apps/${appName}/.env`;
const envFileContents = `
NX_VARIABLE=foo
NX_PUBLIC_VARIABLE=foo
SOME_OTHER_VARIABLE=bar
}`;

Expand Down
38 changes: 19 additions & 19 deletions e2e/web/src/web.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -243,38 +243,38 @@ describe('CLI - Environment Variables', () => {
//test if the Nx CLI loads root .env vars
updateFile(
`.env`,
'NX_WS_BASE=ws-base\nNX_SHARED_ENV=shared-in-workspace-base'
'NX_PUBLIC_WS_BASE=ws-base\nNX_SHARED_ENV=shared-in-workspace-base'
);
updateFile(
`.env.local`,
'NX_WS_ENV_LOCAL=ws-env-local\nNX_SHARED_ENV=shared-in-workspace-env-local'
'NX_PUBLIC_WS_ENV_LOCAL=ws-env-local\nNX_SHARED_ENV=shared-in-workspace-env-local'
);
updateFile(
`.local.env`,
'NX_WS_LOCAL_ENV=ws-local-env\nNX_SHARED_ENV=shared-in-workspace-local-env'
'NX_PUBLIC_WS_LOCAL_ENV=ws-local-env\nNX_SHARED_ENV=shared-in-workspace-local-env'
);
updateFile(
`apps/${appName}/.env`,
'NX_APP_BASE=app-base\nNX_SHARED_ENV=shared-in-app-base'
'NX_PUBLIC_APP_BASE=app-base\nNX_SHARED_ENV=shared-in-app-base'
);
updateFile(
`apps/${appName}/.env.local`,
'NX_APP_ENV_LOCAL=app-env-local\nNX_SHARED_ENV=shared-in-app-env-local'
'NX_PUBLIC_APP_ENV_LOCAL=app-env-local\nNX_SHARED_ENV=shared-in-app-env-local'
);
updateFile(
`apps/${appName}/.local.env`,
'NX_APP_LOCAL_ENV=app-local-env\nNX_SHARED_ENV=shared-in-app-local-env'
'NX_PUBLIC_APP_LOCAL_ENV=app-local-env\nNX_SHARED_ENV=shared-in-app-local-env'
);
const main = `apps/${appName}/src/main.ts`;
const newCode = `
const envVars = [process.env.NODE_ENV, process.env.NX_WS_BASE, process.env.NX_WS_ENV_LOCAL, process.env.NX_WS_LOCAL_ENV, process.env.NX_APP_BASE, process.env.NX_APP_ENV_LOCAL, process.env.NX_APP_LOCAL_ENV, process.env.NX_SHARED_ENV];
const envVars = [process.env.NODE_ENV, process.env.NX_PUBLIC_WS_BASE, process.env.NX_PUBLIC_WS_ENV_LOCAL, process.env.NX_PUBLIC_WS_LOCAL_ENV, process.env.NX_PUBLIC_APP_BASE, process.env.NX_PUBLIC_APP_ENV_LOCAL, process.env.NX_PUBLIC_APP_LOCAL_ENV, process.env.NX_SHARED_ENV];
const nodeEnv = process.env.NODE_ENV;
const nxWsBase = process.env.NX_WS_BASE;
const nxWsEnvLocal = process.env.NX_WS_ENV_LOCAL;
const nxWsLocalEnv = process.env.NX_WS_LOCAL_ENV;
const nxAppBase = process.env.NX_APP_BASE;
const nxAppEnvLocal = process.env.NX_APP_ENV_LOCAL;
const nxAppLocalEnv = process.env.NX_APP_LOCAL_ENV;
const nxWsBase = process.env.NX_PUBLIC_WS_BASE;
const nxWsEnvLocal = process.env.NX_PUBLIC_WS_ENV_LOCAL;
const nxWsLocalEnv = process.env.NX_PUBLIC_WS_LOCAL_ENV;
const nxAppBase = process.env.NX_PUBLIC_APP_BASE;
const nxAppEnvLocal = process.env.NX_PUBLIC_APP_ENV_LOCAL;
const nxAppLocalEnv = process.env.NX_PUBLIC_APP_LOCAL_ENV;
const nxSharedEnv = process.env.NX_SHARED_ENV;
`;

Expand All @@ -290,18 +290,18 @@ describe('CLI - Environment Variables', () => {

updateFile(
`apps/${appName2}/.env`,
'NX_APP_BASE=app2-base\nNX_SHARED_ENV=shared2-in-app-base'
'NX_PUBLIC_APP_BASE=app2-base\nNX_SHARED_ENV=shared2-in-app-base'
);
updateFile(
`apps/${appName2}/.env.local`,
'NX_APP_ENV_LOCAL=app2-env-local\nNX_SHARED_ENV=shared2-in-app-env-local'
'NX_PUBLIC_APP_ENV_LOCAL=app2-env-local\nNX_SHARED_ENV=shared2-in-app-env-local'
);
updateFile(
`apps/${appName2}/.local.env`,
'NX_APP_LOCAL_ENV=app2-local-env\nNX_SHARED_ENV=shared2-in-app-local-env'
'NX_PUBLIC_APP_LOCAL_ENV=app2-local-env\nNX_SHARED_ENV=shared2-in-app-local-env'
);
const main2 = `apps/${appName2}/src/main.ts`;
const newCode2 = `const envVars = [process.env.NODE_ENV, process.env.NX_WS_BASE, process.env.NX_WS_ENV_LOCAL, process.env.NX_WS_LOCAL_ENV, process.env.NX_APP_BASE, process.env.NX_APP_ENV_LOCAL, process.env.NX_APP_LOCAL_ENV, process.env.NX_SHARED_ENV];`;
const newCode2 = `const envVars = [process.env.NODE_ENV, process.env.NX_PUBLIC_WS_BASE, process.env.NX_PUBLIC_WS_ENV_LOCAL, process.env.NX_PUBLIC_WS_LOCAL_ENV, process.env.NX_PUBLIC_APP_BASE, process.env.NX_PUBLIC_APP_ENV_LOCAL, process.env.NX_PUBLIC_APP_LOCAL_ENV, process.env.NX_SHARED_ENV];`;

runCLI(
`generate @nx/web:app ${appName2} --bundler=webpack --no-interactive --compiler=babel`
Expand Down Expand Up @@ -361,14 +361,14 @@ describe('index.html interpolation', () => {
</head>
<body>
<div id='root'></div>
<div>Nx Variable: %NX_VARIABLE%</div>
<div>Nx Variable: %NX_PUBLIC_VARIABLE%</div>
<div>Some other variable: %SOME_OTHER_VARIABLE%</div>
</body>
</html>
`;
const envFilePath = `apps/${appName}/.env`;
const envFileContents = `
NX_VARIABLE=foo
NX_PUBLIC_VARIABLE=foo
SOME_OTHER_VARIABLE=bar
}`;

Expand Down

0 comments on commit 84a4173

Please sign in to comment.