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.

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

E2e 6 #12495

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

E2e 6 #12495

Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion cypress/e2e/po/pages/explorer/charts/charts.po.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class ChartsPage extends PagePo {
const sideNav = new ProductNavPo();

BurgerMenuPo.toggle();
burgerMenu.clusters().contains(clusterId).click();
burgerMenu.clusters().contains(clusterId).click({ force: true });
sideNav.navToSideMenuGroupByLabel('Apps');
}

Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/charts/monitoring-istio.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { IstioTab } from '@/cypress/e2e/po/pages/explorer/charts/tabs/istio-tab.
import { LONG_TIMEOUT_OPT } from '~/cypress/support/utils/timeouts';
import { DEFAULT_GRAFANA_STORAGE_SIZE } from '@shell/config/types.js';

describe.skip('[Vue3 Skip]: Charts', { tags: ['@charts', '@adminUser'] }, () => {
describe('Charts', { tags: ['@charts', '@adminUser'] }, () => {
const chartsPage = new ChartsPage();
const chartPage = new ChartPage();
const installChart = new InstallChartPage();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/charts/v2-monitoring.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { generateV2MonitoringForLocalCluster } from '@/cypress/e2e/blueprints/ot
import V2Monitoring from '@/cypress/e2e/po/other-products/v2-monitoring.po';
import PreferencesPagePo from '@/cypress/e2e/po/pages/preferences.po';

describe.skip('[Vue3 Skip]: V2 monitoring Chart', { tags: ['@charts', '@adminUser'] }, () => {
describe('V2 monitoring Chart', { tags: ['@charts', '@adminUser'] }, () => {
beforeEach(() => {
cy.login();

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,10 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer', '@admi
BurgerMenuPo.checkIfClusterMenuLinkIsHighlighted('local');
});

it.skip('[Vue3 Skip]: has the correct title', () => {
clusterDashboard.goTo('local');
clusterDashboard.waitForPage(undefined, 'cluster-events');
it('has the correct title', () => {
ClusterDashboardPagePo.navTo();

cy.title().should('eq', 'Rancher - local - Cluster Dashboard');
cy.get('[data-testid="page-title"]').should('have.text', 'Rancher - local - Cluster Dashboard');
});

it('shows fleet controller status', () => {
Expand Down
14 changes: 7 additions & 7 deletions cypress/e2e/tests/pages/global-settings/branding.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ describe('Branding', { testIsolation: 'off' }, () => {
cy.title({ timeout: 2000 }).should('eq', settings.privateLabel.original);
});

it.skip('[Vue3 Skip]: Logo', { tags: ['@globalSettings', '@adminUser'] }, () => {
it('Logo', { tags: ['@globalSettings', '@adminUser'] }, () => {
const prefPage = new PreferencesPagePo();

BrandingPagePo.navTo();
Expand Down Expand Up @@ -165,16 +165,16 @@ describe('Branding', { testIsolation: 'off' }, () => {

HomePagePo.navTo();
burgerMenu.headerBrandLogoImage().should('be.visible').then((el) => {
expect(el).to.have.attr('src').includes('/img/rancher-logo.66cf5910.svg');
expect(el).to.have.attr('src').includes('/img/rancher-logo');
});

BurgerMenuPo.toggle();
burgerMenu.brandLogoImage().should('be.visible').then((el) => {
expect(el).to.have.attr('src').includes('/img/rancher-logo.66cf5910.svg');
expect(el).to.have.attr('src').includes('/img/rancher-logo');
});
});

it.skip('[Vue3 Skip]: Banner', { tags: ['@globalSettings', '@adminUser'] }, () => {
it('Banner', { tags: ['@globalSettings', '@adminUser'] }, () => {
const prefPage = new PreferencesPagePo();

BrandingPagePo.navTo();
Expand Down Expand Up @@ -236,11 +236,11 @@ describe('Branding', { testIsolation: 'off' }, () => {

homePage.goTo();
homePage.getBrandBannerImage().should('be.visible').then((el) => {
expect(el).to.have.attr('src').includes('/img/banner.b321f7eb.svg');
expect(el).to.have.attr('src').includes('/img/banner');
});
});

it.skip('[Vue3 Skip]: Login Background', { tags: ['@globalSettings', '@adminUser'] }, () => {
it('Login Background', { tags: ['@globalSettings', '@adminUser'] }, () => {
const prefPage = new PreferencesPagePo();

BrandingPagePo.navTo();
Expand Down Expand Up @@ -309,7 +309,7 @@ describe('Branding', { testIsolation: 'off' }, () => {

loginPage.goTo();
loginPage.loginBackgroundImage().should('be.visible').then((el) => {
expect(el).to.have.attr('src').includes('/img/login-landscape.911b980e.svg');
expect(el).to.have.attr('src').includes('/img/login-landscape');
});

cy.login();
Expand Down
4 changes: 2 additions & 2 deletions shell/public/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="shortcut icon" type="image/x-icon" href="/favicon.png">
<title>Rancher</title>
<title data-testid="page-title">Rancher</title>
</head>

<body>
Expand Down Expand Up @@ -71,4 +71,4 @@
</style>
</body>

</html>
</html>
Loading