Skip to content

Commit

Permalink
Merge pull request #9415 from richard-cox/bump-cypress
Browse files Browse the repository at this point in the history
Bump version of cypress to latest 10.x
  • Loading branch information
richard-cox committed Jul 25, 2023
2 parents c0127b7 + b7687fd commit 660b3c7
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 28 deletions.
36 changes: 18 additions & 18 deletions cypress/e2e/tests/pages/home.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,12 +163,12 @@ describe('Home Page', () => {

homePage.supportLinks().should('have.length', 6);

// click Docs
homePage.clickSupportLink(0, true);
cy.origin('https://rancher.com', () => {
cy.on('uncaught:exception', () => false);
cy.url().should('include', 'ranchermanager.docs.rancher.com');
});
// click Docs - see https://github.com/rancher/dashboard/issues/9417
// homePage.clickSupportLink(0, true);
// cy.origin('https://ranchermanager.docs.rancher.com', () => {
// cy.on('uncaught:exception', () => false);
// cy.url().should('include', 'ranchermanager.docs.rancher.com');
// });

// click Forums link
// NOTE: Cypress does not recognize when the Forum page's contents are loaded
Expand All @@ -179,19 +179,19 @@ describe('Home Page', () => {
// cy.url().should('include', 'forums.rancher.com/');
// });

// click Slack link
HomePagePo.goToAndWaitForGet();
homePage.clickSupportLink(2, true);
cy.origin('https://rancher.io', () => {
cy.url().should('include', 'slack.rancher.io/');
});
// click Slack link - see https://github.com/rancher/dashboard/issues/9417
// HomePagePo.goToAndWaitForGet();
// homePage.clickSupportLink(2, true);
// cy.origin('https://slack.rancher.io', () => {
// cy.url().should('include', 'slack.rancher.io/');
// });

// click File an Issue link
HomePagePo.goToAndWaitForGet();
homePage.clickSupportLink(3, true);
cy.origin('https://github.com', () => {
cy.url().should('include', 'github.com/login');
});
// click File an Issue link - see https://github.com/rancher/dashboard/issues/9417
// HomePagePo.goToAndWaitForGet();
// homePage.clickSupportLink(3, true);
// cy.origin('https://github.com', () => {
// cy.url().should('include', 'github.com/login');
// });

// click Get Started link
HomePagePo.goToAndWaitForGet();
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@
"css-loader": "6.7.3",
"csv-loader": "3.0.3",
"cy2": "2.0.0",
"cypress": "10.3.1",
"cypress": "10.11.0",
"eslint": "7.32.0",
"eslint-config-standard": "16.0.3",
"eslint-import-resolver-node": "0.3.4",
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5995,10 +5995,10 @@ cyclist@^1.0.1:
resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-1.0.1.tgz#596e9698fd0c80e12038c2b82d6eb1b35b6224d9"
integrity sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==

cypress@10.3.1:
version "10.3.1"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.3.1.tgz#7fab4ef43481c05a9a17ebe9a0ec860e15b95a19"
integrity sha512-As9HrExjAgpgjCnbiQCuPdw5sWKx5HUJcK2EOKziu642akwufr/GUeqL5UnCPYXTyyibvEdWT/pSC2qnGW/e5w==
cypress@10.11.0:
version "10.11.0"
resolved "https://registry.yarnpkg.com/cypress/-/cypress-10.11.0.tgz#e9fbdd7638bae3d8fb7619fd75a6330d11ebb4e8"
integrity sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==
dependencies:
"@cypress/request" "^2.88.10"
"@cypress/xvfb" "^1.2.4"
Expand All @@ -6019,7 +6019,7 @@ cypress@10.3.1:
dayjs "^1.10.4"
debug "^4.3.2"
enquirer "^2.3.6"
eventemitter2 "^6.4.3"
eventemitter2 "6.4.7"
execa "4.1.0"
executable "^4.1.1"
extract-zip "2.0.1"
Expand Down Expand Up @@ -7731,10 +7731,10 @@ event-target-shim@5.0.1:
resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==

eventemitter2@^6.4.3:
version "6.4.9"
resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.9.tgz#41f2750781b4230ed58827bc119d293471ecb125"
integrity sha512-JEPTiaOt9f04oa6NOkc4aH+nVp5I3wEjpHbIPqfgCdD5v5bUzy7xQqwcVO2aDQgOWhI28da57HksMrzK9HlRxg==
eventemitter2@6.4.7:
version "6.4.7"
resolved "https://registry.yarnpkg.com/eventemitter2/-/eventemitter2-6.4.7.tgz#a7f6c4d7abf28a14c1ef3442f21cb306a054271d"
integrity sha512-tYUSVOGeQPKt/eC1ABfhHy5Xd96N3oIijJvN3O9+TsC28T5V9yX9oEfEK5faP0EFSNVOG97qtAS68GBrQB2hDg==

eventemitter3@^4.0.0:
version "4.0.7"
Expand Down

0 comments on commit 660b3c7

Please sign in to comment.