miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

chore(repo): enable windows nightly tests (#5889)

Browse Source
This commit is contained in:
Miroslav Jonaš 2021-06-18 21:16:50 +02:00 committed by GitHub
parent 0f4c18218e
commit b3c36dc067
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 323 additions and 273 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
.github/workflows/e2e-matrix.yml vendored
View File

@ -17,12 +17,17 @@ jobs:
matrix: matrix:
os: os:
- ubuntu-latest - ubuntu-latest
# - windows-latest - windows-latest
include: include:
- os: ubuntu-latest - os: ubuntu-latest
os-name: ubuntu os-name: ubuntu
# - os: windows-latest - os: windows-latest
# os-name: windows os-name: windows
exclude:
- os: windows-latest
package_manager: npm
- os: windows-latest
package_manager: yarn
node_version: node_version:
- '14' - '14'
# - '15' # - '15'
@ -31,15 +36,15 @@ jobs:
- yarn - yarn
- pnpm - pnpm
packages: packages:
- e2e-workspace
- e2e-cli,e2e-nx-plugin,dep-graph-dep-graph-e2e
- e2e-cypress,e2e-jest
- e2e-react
- e2e-next
- e2e-gatsby
- e2e-node
- e2e-web,e2e-linter,e2e-storybook
- e2e-angular - e2e-angular
- e2e-cli,e2e-nx-plugin,e2e-jest,e2e-linter,e2e-cypress
- e2e-cypress
- e2e-gatsby,e2e-react
- e2e-next
- e2e-node
- e2e-web
- e2e-storybook
- e2e-workspace
fail-fast: false fail-fast: false
name: ${{ matrix.os-name }}/n v${{ matrix.node_version }}/${{ matrix.package_manager }} - ${{ matrix.packages }} name: ${{ matrix.os-name }}/n v${{ matrix.node_version }}/${{ matrix.package_manager }} - ${{ matrix.packages }}
@ -63,7 +68,8 @@ jobs:
with: with:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }} path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ matrix.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('yarn.lock') }} key: ${{ matrix.os }}-node-${{ matrix.node-version }}-yarn-${{ hashFiles('yarn.lock') }}
restore-keys: ${{ matrix.os }}-node-${{ matrix.node-version }}-yarn- restore-keys: |
${{ matrix.os }}-node-${{ matrix.node-version }}-yarn-
- name: Install packages - name: Install packages
run: yarn install --prefer-offline --non-interactive run: yarn install --prefer-offline --non-interactive
@ -121,4 +127,4 @@ jobs:
mention_users: 'U01UELKLYF2' mention_users: 'U01UELKLYF2'
mention_users_when: 'failure,warnings' mention_users_when: 'failure,warnings'
env: env:
SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }} SLACK_WEBHOOK_URL: ${{ secrets.ACTION_MONITORING_SLACK }}

103
e2e/angular/src/storybook.test.ts
View File

@ -2,6 +2,7 @@ process.env.SELECTED_CLI = 'angular';
import { import {
checkFilesExist, checkFilesExist,
isNotWindows,
killPorts, killPorts,
newProject, newProject,
readFile, readFile,
@ -56,19 +57,20 @@ describe('Storybook schematics', () => {
describe('build storybook', () => { describe('build storybook', () => {
it('should execute e2e tests using Cypress running against Storybook', async () => { it('should execute e2e tests using Cypress running against Storybook', async () => {
const myapp = uniq('myapp'); if (isNotWindows()) {
runCLI(`generate @nrwl/angular:app ${myapp} --no-interactive`); const myapp = uniq('myapp');
runCLI(`generate @nrwl/angular:app ${myapp} --no-interactive`);
const myAngularLib = uniq('test-ui-lib'); const myAngularLib = uniq('test-ui-lib');
createTestUILib(myAngularLib); createTestUILib(myAngularLib);
const myReactLib = uniq('test-ui-lib-react'); const myReactLib = uniq('test-ui-lib-react');
runCLI(`generate @nrwl/react:lib ${myReactLib} --no-interactive`); runCLI(`generate @nrwl/react:lib ${myReactLib} --no-interactive`);
runCLI( runCLI(
`generate @nrwl/react:component Button --project=${myReactLib} --no-interactive` `generate @nrwl/react:component Button --project=${myReactLib} --no-interactive`
); );
writeFileSync( writeFileSync(
tmpProjPath(`libs/${myReactLib}/src/lib/button.tsx`), tmpProjPath(`libs/${myReactLib}/src/lib/button.tsx`),
` `
import React from 'react'; import React from 'react';
import './button.css'; import './button.css';
@ -92,10 +94,10 @@ describe('Storybook schematics', () => {
export default Button; export default Button;
` `
); );
writeFileSync( writeFileSync(
tmpProjPath(`libs/${myReactLib}/src/lib/button.stories.tsx`), tmpProjPath(`libs/${myReactLib}/src/lib/button.stories.tsx`),
` `
import React from 'react'; import React from 'react';
import { Button, ButtonStyle } from './button'; import { Button, ButtonStyle } from './button';
import { text, number } from '@storybook/addon-knobs'; import { text, number } from '@storybook/addon-knobs';
@ -113,20 +115,20 @@ describe('Storybook schematics', () => {
/> />
); );
` `
); );
runCLI( runCLI(
`generate @nrwl/angular:storybook-configuration ${myAngularLib} --configureCypress --generateStories --generateCypressSpecs --no-interactive` `generate @nrwl/angular:storybook-configuration ${myAngularLib} --configureCypress --generateStories --generateCypressSpecs --no-interactive`
); );
runCLI( runCLI(
`generate @nrwl/angular:stories ${myAngularLib} --generateCypressSpecs --no-interactive` `generate @nrwl/angular:stories ${myAngularLib} --generateCypressSpecs --no-interactive`
); );
writeFileSync( writeFileSync(
tmpProjPath( tmpProjPath(
`apps/${myAngularLib}-e2e/src/integration/test-button/test-button.component.spec.ts` `apps/${myAngularLib}-e2e/src/integration/test-button/test-button.component.spec.ts`
), ),
` `
describe('${myAngularLib}', () => { describe('${myAngularLib}', () => {
it('should render the component', () => { it('should render the component', () => {
@ -144,21 +146,21 @@ describe('Storybook schematics', () => {
}); });
}); });
` `
); );
runCLI( runCLI(
`generate @nrwl/react:storybook-configuration ${myReactLib} --configureCypress --no-interactive` `generate @nrwl/react:storybook-configuration ${myReactLib} --configureCypress --no-interactive`
); );
// The following line (mkdirSync...) is not needed, // The following line (mkdirSync...) is not needed,
// since the above schematic creates this directory. // since the above schematic creates this directory.
// So, if we leave it there, there's an error saying the directory exists. // So, if we leave it there, there's an error saying the directory exists.
// I am not sure how it worked as it was :/ // I am not sure how it worked as it was :/
// mkdirSync(tmpProjPath(`apps/${myReactLib}-e2e/src/integration`)); // mkdirSync(tmpProjPath(`apps/${myReactLib}-e2e/src/integration`));
writeFileSync( writeFileSync(
tmpProjPath(`apps/${myReactLib}-e2e/src/integration/button.spec.ts`), tmpProjPath(`apps/${myReactLib}-e2e/src/integration/button.spec.ts`),
` `
describe('react-ui', () => { describe('react-ui', () => {
it('should render the component', () => { it('should render the component', () => {
cy.visit( cy.visit(
@ -175,19 +177,20 @@ describe('Storybook schematics', () => {
}); });
}); });
` `
); );
expect(runCLI(`run ${myAngularLib}-e2e:e2e --no-watch`)).toContain( expect(runCLI(`run ${myAngularLib}-e2e:e2e --no-watch`)).toContain(
'All specs passed!' 'All specs passed!'
); );
runCLI(`run ${myAngularLib}:build-storybook`); runCLI(`run ${myAngularLib}:build-storybook`);
checkFilesExist(`dist/storybook/${myAngularLib}/index.html`); checkFilesExist(`dist/storybook/${myAngularLib}/index.html`);
expect(readFile(`dist/storybook/${myAngularLib}/index.html`)).toContain( expect(readFile(`dist/storybook/${myAngularLib}/index.html`)).toContain(
`<title>Storybook</title>` `<title>Storybook</title>`
); );
expect(await killPorts()).toBeTruthy(); expect(await killPorts()).toBeTruthy();
}
}, 1000000); }, 1000000);
xit('should build an Angular based storybook', () => { xit('should build an Angular based storybook', () => {

1
e2e/gatsby/src/gatsby.test.ts
View File

@ -1,6 +1,5 @@
import { import {
checkFilesExist, checkFilesExist,
killPorts,
newProject, newProject,
runCLI, runCLI,
runCLIAsync, runCLIAsync,

111
e2e/next/src/next.test.ts
View File

@ -2,6 +2,7 @@ import { stringUtils } from '@nrwl/workspace';
import { import {
checkFilesExist, checkFilesExist,
createFile, createFile,
isNotWindows,
killPorts, killPorts,
newProject, newProject,
promisifiedTreeKill, promisifiedTreeKill,
@ -345,7 +346,7 @@ describe('Next.js Applications', () => {
`dist/apps/${appName}/public/a/b.txt`, `dist/apps/${appName}/public/a/b.txt`,
`dist/apps/${appName}/public/shared/ui/hello.txt` `dist/apps/${appName}/public/shared/ui/hello.txt`
); );
}, 120000); }, 300000);
it('should build with a next.config.js file in the dist folder', async () => { it('should build with a next.config.js file in the dist folder', async () => {
const appName = uniq('app'); const appName = uniq('app');
@ -374,7 +375,7 @@ describe('Next.js Applications', () => {
checkFilesExist(`dist/apps/${appName}/next.config.js`); checkFilesExist(`dist/apps/${appName}/next.config.js`);
expect(result).toContain('NODE_ENV is production'); expect(result).toContain('NODE_ENV is production');
}, 120000); }, 300000);
it('should support --js flag', async () => { it('should support --js flag', async () => {
const appName = uniq('app'); const appName = uniq('app');
@ -458,31 +459,32 @@ describe('Next.js Applications', () => {
}, 120000); }, 120000);
it('webpack5 - should be able to consume a react libs (buildable and non-buildable)', async () => { it('webpack5 - should be able to consume a react libs (buildable and non-buildable)', async () => {
const appName = uniq('app'); if (isNotWindows()) {
const buildableLibName = uniq('lib'); const appName = uniq('app');
const nonBuildableLibName = uniq('lib'); const buildableLibName = uniq('lib');
const nonBuildableLibName = uniq('lib');
runCLI(`generate @nrwl/next:app ${appName} --no-interactive`); runCLI(`generate @nrwl/next:app ${appName} --no-interactive`);
runCLI( runCLI(
`generate @nrwl/react:lib ${nonBuildableLibName} --no-interactive --style=none` `generate @nrwl/react:lib ${nonBuildableLibName} --no-interactive --style=none`
); );
runCLI( runCLI(
`generate @nrwl/react:lib ${buildableLibName} --no-interactive --style=none --buildable` `generate @nrwl/react:lib ${buildableLibName} --no-interactive --style=none --buildable`
); );
const mainPath = `apps/${appName}/pages/index.tsx`; const mainPath = `apps/${appName}/pages/index.tsx`;
updateFile( updateFile(
mainPath, mainPath,
` `
import '@${proj}/${nonBuildableLibName}'; import '@${proj}/${nonBuildableLibName}';
import '@${proj}/${buildableLibName}'; import '@${proj}/${buildableLibName}';
${readFile(mainPath)} ${readFile(mainPath)}
` `
); );
// enable webpack 5 // enable webpack 5
updateFile( updateFile(
`apps/${appName}/next.config.js`, `apps/${appName}/next.config.js`,
` `
// eslint-disable-next-line @typescript-eslint/no-var-requires // eslint-disable-next-line @typescript-eslint/no-var-requires
const withNx = require('@nrwl/next/plugins/with-nx'); const withNx = require('@nrwl/next/plugins/with-nx');
@ -497,32 +499,33 @@ describe('Next.js Applications', () => {
} }
}); });
` `
); );
// Update non-buildable lib to use css modules to test that next.js can compile it // Update non-buildable lib to use css modules to test that next.js can compile it
updateFile( updateFile(
`libs/${nonBuildableLibName}/src/lib/${nonBuildableLibName}.tsx`, `libs/${nonBuildableLibName}/src/lib/${nonBuildableLibName}.tsx`,
` `
import styles from './style.module.css'; import styles from './style.module.css';
export function Test() { export function Test() {
return <div className={styles.container}>Hello</div>; return <div className={styles.container}>Hello</div>;
} }
export default Test; export default Test;
` `
); );
updateFile( updateFile(
`libs/${nonBuildableLibName}/src/lib/style.module.css`, `libs/${nonBuildableLibName}/src/lib/style.module.css`,
` `
.container {} .container {}
` `
); );
await checkApp(appName, { await checkApp(appName, {
checkUnitTest: true, checkUnitTest: true,
checkLint: true, checkLint: true,
checkE2E: true, checkE2E: true,
checkWebpack5: true, checkWebpack5: true,
}); });
}
}, 300000); }, 300000);
it('webpack5 - should build with a next.config.js file in the dist folder', async () => { it('webpack5 - should build with a next.config.js file in the dist folder', async () => {
@ -566,29 +569,29 @@ describe('Next.js Applications', () => {
createFile( createFile(
'tools/custom-next-server.ts', 'tools/custom-next-server.ts',
` `
const express = require('express'); const express = require('express');
const path = require('path'); const path = require('path');
export default async function nextCustomServer(app, settings, proxyConfig) { export default async function nextCustomServer(app, settings, proxyConfig) {
const handle = app.getRequestHandler(); const handle = app.getRequestHandler();
await app.prepare(); await app.prepare();
const x: string = 'custom typescript server running'; const x: string = 'custom typescript server running';
console.log(x); console.log(x);
const server = express(); const server = express();
server.disable('x-powered-by'); server.disable('x-powered-by');
server.use( server.use(
express.static(path.resolve(settings.dir, settings.conf.outdir, 'public')) express.static(path.resolve(settings.dir, settings.conf.outdir, 'public'))
); );
// Default catch-all handler to allow Next.js to handle all other routes // Default catch-all handler to allow Next.js to handle all other routes
server.all('*', (req, res) => handle(req, res)); server.all('*', (req, res) => handle(req, res));
server.listen(settings.port, settings.hostname); server.listen(settings.port, settings.hostname);
} }
` `
); );
updateWorkspaceConfig((workspace) => { updateWorkspaceConfig((workspace) => {

2
e2e/node/src/node.test.ts
View File

@ -54,7 +54,7 @@ describe('Node Applications', () => {
cwd: tmpProjPath(), cwd: tmpProjPath(),
}).toString(); }).toString();
expect(result).toContain('Hello World!'); expect(result).toContain('Hello World!');
}, 60000); }, 300000);
xit('should be able to generate an express application', async () => { xit('should be able to generate an express application', async () => {
const nodeapp = uniq('nodeapp'); const nodeapp = uniq('nodeapp');

4
e2e/nx-plugin/src/nx-plugin.test.ts
View File

@ -1,12 +1,12 @@
import { import {
checkFilesExist, checkFilesExist,
expectTestsPass, expectTestsPass,
isNotWindows,
killPorts, killPorts,
newProject, newProject,
readJson, readJson,
runCLI, runCLI,
runCLIAsync, runCLIAsync,
runCypressTests,
uniq, uniq,
workspaceConfigName, workspaceConfigName,
} from '@nrwl/e2e/utils'; } from '@nrwl/e2e/utils';
@ -60,7 +60,7 @@ describe('Nx Plugin', () => {
const plugin = uniq('plugin-name'); const plugin = uniq('plugin-name');
runCLI(`generate @nrwl/nx-plugin:plugin ${plugin} --linter=eslint`); runCLI(`generate @nrwl/nx-plugin:plugin ${plugin} --linter=eslint`);
if (runCypressTests()) { if (isNotWindows()) {
const e2eResults = runCLI(`e2e ${plugin}-e2e --no-watch --headless`); const e2eResults = runCLI(`e2e ${plugin}-e2e --no-watch --headless`);
expect(e2eResults).toContain('Running target "e2e" succeeded'); expect(e2eResults).toContain('Running target "e2e" succeeded');
expect(await killPorts()).toBeTruthy(); expect(await killPorts()).toBeTruthy();

35
e2e/utils/index.ts
View File

@ -16,6 +16,7 @@ import isCI = require('is-ci');
import * as path from 'path'; import * as path from 'path';
import { dirSync } from 'tmp'; import { dirSync } from 'tmp';
const kill = require('kill-port'); const kill = require('kill-port');
const isWindows = require('is-windows');
import { check as portCheck } from 'tcp-port-used'; import { check as portCheck } from 'tcp-port-used';
import { parseJson } from '@nrwl/devkit'; import { parseJson } from '@nrwl/devkit';
import chalk = require('chalk'); import chalk = require('chalk');
@ -119,8 +120,7 @@ export function packageInstall(pkg: string, projName?: string) {
const pm = getPackageManagerCommand({ path: cwd }); const pm = getPackageManagerCommand({ path: cwd });
const install = execSync(`${pm.addDev} ${pkg}`, { const install = execSync(`${pm.addDev} ${pkg}`, {
cwd, cwd,
// ...{ stdio: ['pipe', 'pipe', 'pipe'] }, stdio: [0, 1, 2],
...{ stdio: [0, 1, 2] },
env: process.env, env: process.env,
encoding: 'utf-8', encoding: 'utf-8',
}); });
@ -189,8 +189,7 @@ export function newProject({ name = uniq('proj') } = {}): string {
} }
return projScope; return projScope;
} catch (e) { } catch (e) {
console.log(`Failed to set up project for e2e tests.`); logError(`Failed to set up project for e2e tests.`, e.message);
console.log(e.message);
throw e; throw e;
} }
} }
@ -240,6 +239,10 @@ export function runCypressTests() {
return true; return true;
} }
export function isNotWindows() {
return !isWindows();
}
export function runCommandAsync( export function runCommandAsync(
command: string, command: string,
opts: RunCmdOpts = { opts: RunCmdOpts = {
@ -346,7 +349,10 @@ export function runNgAdd(
if (opts.silenceError) { if (opts.silenceError) {
return e.stdout.toString(); return e.stdout.toString();
} else { } else {
console.log(e.stdout.toString(), e.stderr.toString()); logError(
`Ng Add failed: ${command}`,
`${e.stdout?.toString()}\n\n${e.stderr?.toString()}`
);
throw e; throw e;
} }
} }
@ -372,8 +378,7 @@ export function runCLI(
'' ''
); );
if (process.env.VERBOSE_OUTPUT) { if (process.env.VERBOSE_OUTPUT) {
console.log('result of running:', command); logInfo(`result of running: ${command}`, r);
console.log(r);
} }
const needsMaxWorkers = /g.*(express|nest|node|web|react):app.*/; const needsMaxWorkers = /g.*(express|nest|node|web|react):app.*/;
@ -384,10 +389,12 @@ export function runCLI(
return r; return r;
} catch (e) { } catch (e) {
if (opts.silenceError) { if (opts.silenceError) {
return e.stdout.toString() + e.stderr?.toString(); return e.stdout?.toString() + e.stderr?.toString();
} else { } else {
console.log('original command', command); logError(
console.log(e.stdout?.toString(), e.stderr?.toString()); `Original command: ${command}`,
`${e.stdout?.toString()}\n\n${e.stderr?.toString()}`
);
throw e; throw e;
} }
} }
@ -415,6 +422,8 @@ export function runCommand(command: string): string {
} }
return r; return r;
} catch (e) { } catch (e) {
// this is intentional
// npm ls fails if package is not found
return e.stdout.toString() + e.stderr.toString(); return e.stdout.toString() + e.stderr.toString();
} }
} }
@ -567,9 +576,9 @@ export function logInfo(title: string, body?: string) {
} }
export function logError(title: string, body?: string) { export function logError(title: string, body?: string) {
const message = `${chalk.reset.inverse.bold.green( const message = `${chalk.reset.inverse.bold.red(' ERROR ')} ${chalk.bold.red(
' ERROR ' title
)} ${chalk.bold.red(title)}`; )}`;
return e2eConsoleLogger(message, body); return e2eConsoleLogger(message, body);
} }

3
e2e/web/src/web.test.ts
View File

@ -2,6 +2,7 @@ import {
checkFilesDoNotExist, checkFilesDoNotExist,
checkFilesExist, checkFilesExist,
createFile, createFile,
isNotWindows,
killPorts, killPorts,
newProject, newProject,
readFile, readFile,
@ -52,7 +53,7 @@ describe('Web Components Applications', () => {
const lintE2eResults = runCLI(`lint ${appName}-e2e`); const lintE2eResults = runCLI(`lint ${appName}-e2e`);
expect(lintE2eResults).toContain('All files pass linting.'); expect(lintE2eResults).toContain('All files pass linting.');
if (runCypressTests()) { if (isNotWindows()) {
const e2eResults = runCLI(`e2e ${appName}-e2e --headless`); const e2eResults = runCLI(`e2e ${appName}-e2e --headless`);
expect(e2eResults).toContain('All specs passed!'); expect(e2eResults).toContain('All specs passed!');
expect(await killPorts()).toBeTruthy(); expect(await killPorts()).toBeTruthy();

201
e2e/workspace/src/workspace-aux-commands.test.ts
View File

@ -2,6 +2,7 @@ import * as path from 'path';
import { import {
checkFilesExist, checkFilesExist,
exists, exists,
isNotWindows,
newProject, newProject,
readFile, readFile,
readJson, readJson,
@ -116,128 +117,132 @@ describe('lint', () => {
describe('format', () => { describe('format', () => {
it('should check and reformat the code', async () => { it('should check and reformat the code', async () => {
const myapp = uniq('myapp'); if (isNotWindows()) {
const mylib = uniq('mylib'); const myapp = uniq('myapp');
const mylib = uniq('mylib');
runCLI(`generate @nrwl/angular:app ${myapp}`); runCLI(`generate @nrwl/angular:app ${myapp}`);
runCLI(`generate @nrwl/angular:lib ${mylib}`); runCLI(`generate @nrwl/angular:lib ${mylib}`);
updateFile( updateFile(
`apps/${myapp}/src/main.ts`, `apps/${myapp}/src/main.ts`,
` `
const x = 1111; const x = 1111;
` `
); );
updateFile( updateFile(
`apps/${myapp}/src/app/app.module.ts`, `apps/${myapp}/src/app/app.module.ts`,
` `
const y = 1111; const y = 1111;
` `
); );
updateFile( updateFile(
`apps/${myapp}/src/app/app.component.ts`, `apps/${myapp}/src/app/app.component.ts`,
` `
const z = 1111; const z = 1111;
` `
); );
updateFile( updateFile(
`libs/${mylib}/index.ts`, `libs/${mylib}/index.ts`,
` `
const x = 1111; const x = 1111;
` `
); );
updateFile( updateFile(
`libs/${mylib}/src/${mylib}.module.ts`, `libs/${mylib}/src/${mylib}.module.ts`,
` `
const y = 1111; const y = 1111;
` `
); );
updateFile( updateFile(
`README.md`, `README.md`,
` `
my new readme; my new readme;
` `
); );
let stdout = runCLI( let stdout = runCLI(
`format:check --files="libs/${mylib}/index.ts,package.json" --libs-and-apps`, `format:check --files="libs/${mylib}/index.ts,package.json" --libs-and-apps`,
{ silenceError: true } { silenceError: true }
); );
expect(stdout).toContain(path.normalize(`libs/${mylib}/index.ts`)); expect(stdout).toContain(path.normalize(`libs/${mylib}/index.ts`));
expect(stdout).toContain( expect(stdout).toContain(
path.normalize(`libs/${mylib}/src/${mylib}.module.ts`) path.normalize(`libs/${mylib}/src/${mylib}.module.ts`)
); );
expect(stdout).not.toContain(path.normalize(`README.md`)); // It will be contained only in case of exception, that we fallback to all expect(stdout).not.toContain(path.normalize(`README.md`)); // It will be contained only in case of exception, that we fallback to all
stdout = runCLI(`format:check --all`, { silenceError: true }); stdout = runCLI(`format:check --all`, { silenceError: true });
expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`)); expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`));
expect(stdout).toContain( expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.module.ts`) path.normalize(`apps/${myapp}/src/app/app.module.ts`)
); );
expect(stdout).toContain( expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.component.ts`) path.normalize(`apps/${myapp}/src/app/app.component.ts`)
); );
stdout = runCLI(`format:check --projects=${myapp}`, { silenceError: true }); stdout = runCLI(`format:check --projects=${myapp}`, {
expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`));
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.module.ts`)
);
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.component.ts`)
);
expect(stdout).not.toContain(path.normalize(`libs/${mylib}/index.ts`));
expect(stdout).not.toContain(
path.normalize(`libs/${mylib}/src/${mylib}.module.ts`)
);
expect(stdout).not.toContain(path.normalize(`README.md`));
stdout = runCLI(`format:check --projects=${myapp},${mylib}`, {
silenceError: true,
});
expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`));
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.module.ts`)
);
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.component.ts`)
);
expect(stdout).toContain(path.normalize(`libs/${mylib}/index.ts`));
expect(stdout).toContain(
path.normalize(`libs/${mylib}/src/${mylib}.module.ts`)
);
expect(stdout).not.toContain(path.normalize(`README.md`));
const { stderr } = await runCLIAsync(
`format:check --projects=${myapp},${mylib} --all`,
{
silenceError: true, silenceError: true,
} });
); expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`));
expect(stderr).toContain( expect(stdout).toContain(
'Arguments all and projects are mutually exclusive' path.normalize(`apps/${myapp}/src/app/app.module.ts`)
); );
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.component.ts`)
);
expect(stdout).not.toContain(path.normalize(`libs/${mylib}/index.ts`));
expect(stdout).not.toContain(
path.normalize(`libs/${mylib}/src/${mylib}.module.ts`)
);
expect(stdout).not.toContain(path.normalize(`README.md`));
runCLI( stdout = runCLI(`format:check --projects=${myapp},${mylib}`, {
`format:write --files="apps/${myapp}/src/app/app.module.ts,apps/${myapp}/src/app/app.component.ts"` silenceError: true,
); });
expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`));
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.module.ts`)
);
expect(stdout).toContain(
path.normalize(`apps/${myapp}/src/app/app.component.ts`)
);
expect(stdout).toContain(path.normalize(`libs/${mylib}/index.ts`));
expect(stdout).toContain(
path.normalize(`libs/${mylib}/src/${mylib}.module.ts`)
);
expect(stdout).not.toContain(path.normalize(`README.md`));
stdout = runCLI('format:check --all', { silenceError: true }); const { stderr } = await runCLIAsync(
expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`)); `format:check --projects=${myapp},${mylib} --all`,
expect(stdout).not.toContain( {
path.normalize(`apps/${myapp}/src/app/app.module.ts`) silenceError: true,
); }
expect(stdout).not.toContain( );
path.normalize(`apps/${myapp}/src/app/app.component.ts`) expect(stderr).toContain(
); 'Arguments all and projects are mutually exclusive'
);
runCLI('format:write --all'); runCLI(
expect(runCLI('format:check --all')).not.toContain( `format:write --files="apps/${myapp}/src/app/app.module.ts,apps/${myapp}/src/app/app.component.ts"`
path.normalize(`apps/${myapp}/src/main.ts`) );
);
stdout = runCLI('format:check --all', { silenceError: true });
expect(stdout).toContain(path.normalize(`apps/${myapp}/src/main.ts`));
expect(stdout).not.toContain(
path.normalize(`apps/${myapp}/src/app/app.module.ts`)
);
expect(stdout).not.toContain(
path.normalize(`apps/${myapp}/src/app/app.component.ts`)
);
runCLI('format:write --all');
expect(runCLI('format:check --all')).not.toContain(
path.normalize(`apps/${myapp}/src/main.ts`)
);
}
}, 90000); }, 90000);
}); });

93
e2e/workspace/src/workspace.test.ts
View File

@ -2,6 +2,7 @@ import type { NxJsonConfiguration } from '@nrwl/devkit';
import { import {
getPackageManagerCommand, getPackageManagerCommand,
getSelectedPackageManager, getSelectedPackageManager,
isNotWindows,
listFiles, listFiles,
newProject, newProject,
readFile, readFile,
@ -468,14 +469,15 @@ describe('affected:*', () => {
}); });
describe('affected (with git)', () => { describe('affected (with git)', () => {
let myapp = uniq('myapp'); let myapp;
let myapp2 = uniq('myapp'); let myapp2;
let mylib = uniq('mylib'); let mylib;
beforeAll(() => newProject()); beforeEach(() => {
afterAll(() => removeProject({ onlyOnCI: true })); myapp = uniq('myapp');
myapp2 = uniq('myapp');
it('should not affect other projects by generating a new project', () => { mylib = uniq('mylib');
newProject();
const nxJson: NxJsonConfiguration = readJson('nx.json'); const nxJson: NxJsonConfiguration = readJson('nx.json');
delete nxJson.implicitDependencies; delete nxJson.implicitDependencies;
@ -487,57 +489,78 @@ describe('affected (with git)', () => {
runCommand( runCommand(
`git add . && git commit -am "initial commit" && git checkout -b master` `git add . && git commit -am "initial commit" && git checkout -b master`
); );
});
afterAll(() => removeProject({ onlyOnCI: true }));
function generateAll() {
runCLI(`generate @nrwl/angular:app ${myapp}`); runCLI(`generate @nrwl/angular:app ${myapp}`);
expect(runCLI('affected:apps')).toContain(myapp);
runCommand(`git add . && git commit -am "add ${myapp}"`);
runCLI(`generate @nrwl/angular:app ${myapp2}`); runCLI(`generate @nrwl/angular:app ${myapp2}`);
expect(runCLI('affected:apps')).not.toContain(myapp);
expect(runCLI('affected:apps')).toContain(myapp2);
runCommand(`git add . && git commit -am "add ${myapp2}"`);
runCLI(`generate @nrwl/angular:lib ${mylib}`); runCLI(`generate @nrwl/angular:lib ${mylib}`);
expect(runCLI('affected:apps')).not.toContain(myapp); runCommand(`git add . && git commit -am "add all"`);
expect(runCLI('affected:apps')).not.toContain(myapp2); }
expect(runCLI('affected:libs')).toContain(mylib);
runCommand(`git add . && git commit -am "add ${mylib}"`); it('should not affect other projects by generating a new project', () => {
// TODO: investigate why affected gives different results on windows
if (isNotWindows()) {
runCLI(`generate @nrwl/angular:app ${myapp}`);
expect(runCLI('affected:apps')).toContain(myapp);
runCommand(`git add . && git commit -am "add ${myapp}"`);
runCLI(`generate @nrwl/angular:app ${myapp2}`);
expect(runCLI('affected:apps')).not.toContain(myapp);
expect(runCLI('affected:apps')).toContain(myapp2);
runCommand(`git add . && git commit -am "add ${myapp2}"`);
runCLI(`generate @nrwl/angular:lib ${mylib}`);
expect(runCLI('affected:apps')).not.toContain(myapp);
expect(runCLI('affected:apps')).not.toContain(myapp2);
expect(runCLI('affected:libs')).toContain(mylib);
}
}, 1000000); }, 1000000);
it('should detect changes to projects based on the nx.json', () => { it('should detect changes to projects based on the nx.json', () => {
const nxJson: NxJsonConfiguration = readJson('nx.json'); // TODO: investigate why affected gives different results on windows
if (isNotWindows()) {
generateAll();
const nxJson: NxJsonConfiguration = readJson('nx.json');
nxJson.projects[myapp].tags = ['tag']; nxJson.projects[myapp].tags = ['tag'];
updateFile('nx.json', JSON.stringify(nxJson)); updateFile('nx.json', JSON.stringify(nxJson));
expect(runCLI('affected:apps')).toContain(myapp);
expect(runCLI('affected:apps')).not.toContain(myapp2); expect(runCLI('affected:apps')).toContain(myapp);
expect(runCLI('affected:libs')).not.toContain(mylib); expect(runCLI('affected:apps')).not.toContain(myapp2);
runCommand(`git add . && git commit -am "add tag to ${myapp}"`); expect(runCLI('affected:libs')).not.toContain(mylib);
}
}); });
it('should detect changes to projects based on the workspace.json', () => { it('should detect changes to projects based on the workspace.json', () => {
const workspaceJson = readJson(workspaceConfigName()); // TODO: investigate why affected gives different results on windows
if (isNotWindows()) {
generateAll();
const workspaceJson = readJson(workspaceConfigName());
workspaceJson.projects[myapp].prefix = 'my-app'; workspaceJson.projects[myapp].prefix = 'my-app';
updateFile(workspaceConfigName(), JSON.stringify(workspaceJson)); updateFile(workspaceConfigName(), JSON.stringify(workspaceJson));
expect(runCLI('affected:apps')).toContain(myapp);
expect(runCLI('affected:apps')).not.toContain(myapp2); expect(runCLI('affected:apps')).toContain(myapp);
expect(runCLI('affected:libs')).not.toContain(mylib); expect(runCLI('affected:apps')).not.toContain(myapp2);
runCommand(`git add . && git commit -am "change prefix for ${myapp}"`); expect(runCLI('affected:libs')).not.toContain(mylib);
}
}); });
it('should affect all projects by removing projects', () => { it('should affect all projects by removing projects', () => {
generateAll();
const workspaceJson = readJson(workspaceConfigName()); const workspaceJson = readJson(workspaceConfigName());
const nxJson = readJson('nx.json');
delete workspaceJson.projects[mylib]; delete workspaceJson.projects[mylib];
updateFile(workspaceConfigName(), JSON.stringify(workspaceJson)); updateFile(workspaceConfigName(), JSON.stringify(workspaceJson));
const nxJson = readJson('nx.json');
delete nxJson.projects[mylib]; delete nxJson.projects[mylib];
updateFile('nx.json', JSON.stringify(nxJson)); updateFile('nx.json', JSON.stringify(nxJson));
expect(runCLI('affected:apps')).toContain(myapp); expect(runCLI('affected:apps')).toContain(myapp);
expect(runCLI('affected:apps')).toContain(myapp2); expect(runCLI('affected:apps')).toContain(myapp2);
expect(runCLI('affected:libs')).not.toContain(mylib); expect(runCLI('affected:libs')).not.toContain(mylib);
runCommand(`git add . && git commit -am "remove ${mylib}"`);
}); });
}); });

1
package.json
View File

@ -153,6 +153,7 @@
"import-fresh": "^3.1.0", "import-fresh": "^3.1.0",
"injection-js": "^2.4.0", "injection-js": "^2.4.0",
"is-ci": "^3.0.0", "is-ci": "^3.0.0",
"is-windows": "^1.0.2",
"jasmine-core": "~2.99.1", "jasmine-core": "~2.99.1",
"jasmine-marbles": "~0.6.0", "jasmine-marbles": "~0.6.0",
"jasmine-spec-reporter": "~4.2.1", "jasmine-spec-reporter": "~4.2.1",

2
packages/nest/src/generators/convert-tslint-to-eslint/convert-tslint-to-eslint.ts
View File

@ -48,7 +48,7 @@ export async function conversionGenerator(
if (projectConfig.projectType === 'application') { if (projectConfig.projectType === 'application') {
await addLintingToApplication(host, { await addLintingToApplication(host, {
linter: 'eslint' as any, linter: 'eslint',
name: projectName, name: projectName,
appProjectRoot: projectConfig.root, appProjectRoot: projectConfig.root,
js, js,

8
packages/nx-plugin/src/generators/e2e-project/files/tests/__pluginName__.spec.ts__tmpl__
View File

@ -13,7 +13,7 @@ describe('<%= pluginName %> e2e', () => {
const result = await runNxCommandAsync(`build ${plugin}`); const result = await runNxCommandAsync(`build ${plugin}`);
expect(result.stdout).toContain('Executor ran'); expect(result.stdout).toContain('Executor ran');
}, 30000) }, 120000)
describe('--directory', () => { describe('--directory', () => {
it('should create src in the specified directory', async () => { it('should create src in the specified directory', async () => {
@ -23,7 +23,7 @@ describe('<%= pluginName %> e2e', () => {
`generate <%=npmPackageName%>:<%= pluginName %> ${plugin} --directory subdir` `generate <%=npmPackageName%>:<%= pluginName %> ${plugin} --directory subdir`
); );
expect(() => checkFilesExist(`libs/subdir/${plugin}/src/index.ts`)).not.toThrow(); expect(() => checkFilesExist(`libs/subdir/${plugin}/src/index.ts`)).not.toThrow();
}, 30000); }, 120000);
}); });
describe('--tags', () => { describe('--tags', () => {
@ -35,6 +35,6 @@ describe('<%= pluginName %> e2e', () => {
); );
const nxJson = readJson('nx.json'); const nxJson = readJson('nx.json');
expect(nxJson.projects[plugin].tags).toEqual(['e2etag', 'e2ePackage']); expect(nxJson.projects[plugin].tags).toEqual(['e2etag', 'e2ePackage']);
}, 30000); }, 120000);
}); });
}) })