Skip to content

Commit

Permalink
Merge pull request #11712 from codyrancher/title-test-fix
Browse files Browse the repository at this point in the history
Updating how we access the title in e2e tests
  • Loading branch information
codyrancher committed Aug 28, 2024
2 parents 8c0d31d + 5c9ab7b commit ebea9f8
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/explorer/apps/charts.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ describe('Apps/Charts', { tags: ['@explorer', '@adminUser'] }, () => {
chartsPage.bannerContent().should('be.visible').and('not.be.empty');
});

it.skip('[Vue3 Skip]: filtering the Charts (search box) should not impact the Charts carousel', () => {
it('filtering the Charts (search box) should not impact the Charts carousel', () => {
chartsPage.chartsFilterCategoriesSelect().checkOptionSelected('All Categories');
chartsPage.chartsFilterReposSelect().checkOptionSelected('All');
chartsPage.chartsFilterInput().clear();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ describe('Ingresses', { testIsolation: 'off', tags: ['@explorer', '@adminUser']
cy.login();
});

it.skip('[Vue3 Skip]: does not show console warning due to lack of secondary schemas needed to load data on list view', () => {
it('does not show console warning due to lack of secondary schemas needed to load data on list view', () => {
// pattern as per https://docs.cypress.io/faq/questions/using-cypress-faq#How-do-I-spy-on-consolelog
cy.visit(ingressPagePo.urlPath(), {
onBeforeLoad(win) {
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/explorer2/resource-search.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ describe('Cluster Dashboard', { testIsolation: 'off', tags: ['@explorer2', '@adm
dialog.checkNotExists();
});

it.skip('can show resource dialog when namespace chooser is open', () => {
it('can show resource dialog when namespace chooser is open', () => {
const namespacePicker = new NamespaceFilterPo();

namespacePicker.toggle();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/extensions/extensions.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('Extensions page', { tags: ['@extensions', '@adminUser'] }, () => {
extensionsPo.addExtensionsRepository('https://github.com/rancher/ui-plugin-examples', 'main', 'rancher-plugin-examples');
});

it.skip('[Vue3 Skip]: has the correct title', () => {
it('has the correct title', () => {
const extensionsPo = new ExtensionsPagePo();

extensionsPo.goTo();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/global-settings/branding.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('Branding', { testIsolation: 'off' }, () => {
brandingPage.waitForPageWithClusterId();
});

it.skip('[Vue3 Skip]: Private Label', { tags: ['@globalSettings', '@adminUser'] }, () => {
it('Private Label', { tags: ['@globalSettings', '@adminUser'] }, () => {
const brandingPage = new BrandingPagePo();

BrandingPagePo.navTo();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/tests/pages/global-settings/settings.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ describe('Settings', { testIsolation: 'off' }, () => {
HomePagePo.goTo();
});

it.skip('[Vue3 Skip]: has the correct title', { tags: ['@globalSettings', '@adminUser'] }, () => {
it('has the correct title', { tags: ['@globalSettings', '@adminUser'] }, () => {
SettingsPagePo.navTo();

cy.title().should('eq', 'Rancher - Global Settings - Settings');
Expand Down
2 changes: 1 addition & 1 deletion shell/components/TabTitle.vue
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export default {
methods: {
// This isn't a computed prop because it would trigger a recompute when the $slots changed
computeTitle() {
if (!this.$slots.default || this.$slots.default()[0].type.description !== 'Text') {
if (!this.$slots.default || (typeof this.$slots.default()[0].children) !== 'string') {
console.error('The <TabTitle> component only supports text as the child.'); // eslint-disable-line no-console
return [];
Expand Down

0 comments on commit ebea9f8

Please sign in to comment.