Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(testing): bump cypress to latest for angular CT #17788

Merged
merged 2 commits into from
Jun 27, 2023
Merged

feat(testing): bump cypress to latest for angular CT #17788

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
85a4246
feat(testing): bump cypress to latest for angular CT
barbados-clemens Jun 26, 2023
10149b0
chore(testing): update migration target
barbados-clemens Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions e2e/angular-extensions/src/cypress-component-tests.test.ts
View file
Open in desktop
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', () => {
barbados-clemens marked this conversation as resolved.
Show resolved Hide resolved
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
View file
Open in desktop
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
View file
Open in desktop
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
}
}
}
}
}
242 changes: 0 additions & 242 deletions packages/cypress/src/migrations/update-16-4-0/warn-incompatible-angular-cypress.spec.ts
View file
Open in desktop

This file was deleted.

70 changes: 0 additions & 70 deletions packages/cypress/src/migrations/update-16-4-0/warn-incompatible-angular-cypress.ts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion packages/cypress/src/utils/versions.ts
View file
Open in desktop
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