Skip to content

Commit

Permalink
feat(testing): bump cypress to latest for angular CT (#17788)
Browse files Browse the repository at this point in the history
Co-authored-by: Leosvel Pérez Espinosa <[email protected]>
  • Loading branch information
barbados-clemens and leosvelperez authored Jun 27, 2023
1 parent bd7157b commit 8a63d38
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 323 deletions.
3 changes: 1 addition & 2 deletions e2e/angular-extensions/src/cypress-component-tests.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ import {
import { names } from '@nx/devkit';
import { join } from 'path';

// TODO(leo): enable when https://github.com/cypress-io/cypress/pull/27030 is merged and released
describe.skip('Angular Cypress Component Tests', () => {
describe('Angular Cypress Component Tests', () => {
let projectName: string;
const appName = uniq('cy-angular-app');
const usedInAppLibName = uniq('cy-angular-lib');
Expand Down
3 changes: 1 addition & 2 deletions e2e/cypress/src/cypress.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -178,8 +178,7 @@ describe('env vars', () => {
'should allow CT and e2e in the same project',
async () => {
await testCtAndE2eInProject('next');
// TODO(leo): uncomment when https://github.com/cypress-io/cypress/pull/27030 is merged and released
// await testCtAndE2eInProject('angular');
await testCtAndE2eInProject('angular');
await testCtAndE2eInProject('react');
},
TEN_MINS_MS
Expand Down
18 changes: 12 additions & 6 deletions packages/cypress/migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,6 @@
"version": "16.4.0-beta.10",
"description": "Remove tsconfig.e2e.json and add settings to project tsconfig.json. tsConfigs executor option is now deprecated. The project level tsconfig.json file should be used instead.",
"implementation": "./src/migrations/update-16-4-0/tsconfig-sourcemaps"
},
"update-16-4-0-warn-incompatible-angular-cypress": {
"cli": "nx",
"version": "16.4.0-beta.11",
"description": "Cypress Component Testing is broken with Angular 16.1.0. Warn about it if the workspace has Angular >= 16.1.0 and Angular projects using Component Testing.",
"implementation": "./src/migrations/update-16-4-0/warn-incompatible-angular-cypress"
}
},
"packageJsonUpdates": {
Expand All @@ -79,6 +73,18 @@
"alwaysAddToPackageJson": false
}
}
},
"16.5.0": {
"version": "16.5.0-beta.0",
"requires": {
"cypress": ">=12.0.0 <12.16.0"
},
"packages": {
"cypress": {
"version": "^12.16.0",
"alwaysAddToPackageJson": false
}
}
}
}
}

This file was deleted.

This file was deleted.

2 changes: 1 addition & 1 deletion packages/cypress/src/utils/versions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const nxVersion = require('../../package.json').version;
export const eslintPluginCypressVersion = '^2.10.3';
export const typesNodeVersion = '16.11.7';
export const cypressViteDevServerVersion = '^2.2.1';
export const cypressVersion = '^12.11.0';
export const cypressVersion = '^12.16.0';
export const cypressWebpackVersion = '^2.0.0';
export const webpackHttpPluginVersion = '^5.5.0';
export const viteVersion = '^4.3.4';
Expand Down

1 comment on commit 8a63d38

@vercel
Copy link

@vercel vercel bot commented on 8a63d38 Jun 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

nx-dev – ./

nx-dev-git-master-nrwl.vercel.app
nx-dev-nrwl.vercel.app
nx-five.vercel.app
nx.dev

Please sign in to comment.