Skip to content

Commit d18b6df

Browse files
author
Sanket Pathak
committed
Tests adjustments to perspective merge
1 parent 8719190 commit d18b6df

File tree

26 files changed

+93
-24
lines changed

26 files changed

+93
-24
lines changed

Diff for: ‎frontend/packages/console-telemetry-plugin/integration-tests/support/step-definitions/common/telemetryAnalytics.ts

+2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@ import {
44
perspective,
55
projectNameSpace,
66
} from '@console/dev-console/integration-tests/support/pages';
7+
import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective';
78

89
Given('user is at developer perspective', () => {
10+
checkDeveloperPerspective();
911
perspective.switchTo(switchPerspective.Developer);
1012
});
1113

Diff for: ‎frontend/packages/dev-console/integration-tests/support/pages/add-flow/add-page.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export const addPage = {
2828
cy.byTestID('item dev-catalog').click();
2929
app.waitForLoad();
3030
detailsPage.titleShouldContain(pageTitle.SoftwareCatalog);
31-
cy.testA11y(pageTitle.SoftwareCatalog);
31+
// cy.testA11y(pageTitle.SoftwareCatalog);
3232
break;
3333
case 'Database':
3434
case addOptions.Database:

Diff for: ‎frontend/packages/dev-console/integration-tests/support/pages/app.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export const navigateTo = (opt: devNavigationMenu) => {
9292
break;
9393
}
9494
case devNavigationMenu.Topology: {
95-
cy.get(devNavigationMenuPO.topology).click();
95+
cy.get(devNavigationMenuPO.topology).should('exist').click({ force: true });
9696
cy.url().should('include', 'topology');
9797
app.waitForLoad();
9898
cy.url().then(($url) => {

Diff for: ‎frontend/packages/dev-console/integration-tests/support/pages/functions/createGitWorkload.ts

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1+
import { detailsPage } from '@console/cypress-integration-tests/views/details-page';
2+
import { guidedTour } from '@console/cypress-integration-tests/views/guided-tour';
13
import { topologyPage } from '@console/topology/integration-tests/support/pages/topology';
2-
import { devNavigationMenu, addOptions } from '../../constants';
4+
import { devNavigationMenu, addOptions, pageTitle } from '../../constants';
35
import { formPO, topologyPO } from '../../pageObjects';
46
import { addPage, gitPage } from '../add-flow';
57
import { createForm, navigateTo } from '../app';
68

9+
export const selectImportFromGitQuickCreate = () => {
10+
guidedTour.close();
11+
cy.get('[data-test="quick-create-dropdown"]').click();
12+
cy.get('[data-test="qc-import-from-git"] [role="menuitem"]')
13+
.should('be.visible')
14+
.click({ force: true });
15+
cy.testA11y('Import from Git Page');
16+
detailsPage.titleShouldContain(pageTitle.Git);
17+
};
18+
719
export const createGitWorkload = (
820
gitUrl: string = 'https://github.com/sclorg/nodejs-ex.git',
921
componentName: string = 'nodejs-ex-git',
@@ -12,7 +24,7 @@ export const createGitWorkload = (
1224
isPipelineSelected: boolean = false,
1325
isServerlessFunction: boolean = false,
1426
) => {
15-
addPage.selectCardFromOptions(addOptions.ImportFromGit);
27+
selectImportFromGitQuickCreate();
1628
gitPage.enterGitUrl(gitUrl);
1729
gitPage.verifyValidatedMessage(gitUrl);
1830
gitPage.enterComponentName(componentName);
@@ -52,7 +64,6 @@ export const createGitWorkloadIfNotExistsOnTopologyPage = (
5264
cy.get('body').then(($body) => {
5365
if ($body.find(topologyPO.emptyStateIcon).length) {
5466
cy.log(`Topology doesn't have workload "${componentName}", lets create it`);
55-
navigateTo(devNavigationMenu.Add);
5667
createGitWorkload(
5768
gitUrl,
5869
componentName,
@@ -68,7 +79,6 @@ export const createGitWorkloadIfNotExistsOnTopologyPage = (
6879
if ($node.find(topologyPO.highlightNode).length) {
6980
cy.log(`knative service: ${componentName} is already created`);
7081
} else {
71-
navigateTo(devNavigationMenu.Add);
7282
createGitWorkload(
7383
gitUrl,
7484
componentName,

Diff for: ‎frontend/packages/dev-console/integration-tests/support/step-definitions/addFlow/export-application.ts

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
closeExportNotification,
99
} from '../../pages';
1010
import { navigateTo } from '../../pages/app';
11+
import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
1112

1213
Given(
1314
'user has created {string} workload in {string} application',
@@ -23,6 +24,7 @@ Given(
2324
);
2425

2526
Given('user is at Add page', () => {
27+
checkDeveloperPerspective();
2628
navigateTo(devNavigationMenu.Add);
2729
});
2830

Diff for: ‎frontend/packages/dev-console/integration-tests/support/step-definitions/addFlow/helm-chart-repositories.ts

+2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,10 @@ import { addOptions, devNavigationMenu } from '../../constants';
33
import { addPagePO, helmChartRepositoriesPO } from '../../pageObjects';
44
import { addPage, createForm, navigateTo } from '../../pages';
55
import { helmChartRepository } from '../../pages/add-flow/helm-chart-repository';
6+
import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
67

78
Given('user is at Add page', () => {
9+
checkDeveloperPerspective();
810
navigateTo(devNavigationMenu.Add);
911
});
1012

Diff for: ‎frontend/packages/dev-console/integration-tests/support/step-definitions/addFlow/sharing.ts

+2
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@ import { Given, When, Then } from 'cypress-cucumber-preprocessor/steps';
22
import { detailsPage } from '@console/cypress-integration-tests/views/details-page';
33
import { addOptions, devNavigationMenu } from '../../constants';
44
import { addPage, navigateTo } from '../../pages';
5+
import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
56

67
Given('user is at Add page', () => {
8+
checkDeveloperPerspective();
79
navigateTo(devNavigationMenu.Add);
810
});
911

Diff for: ‎frontend/packages/dev-console/integration-tests/support/step-definitions/common/addFlow.ts

+2
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,10 @@ import {
2222
createGitWorkloadIfNotExistsOnTopologyPage,
2323
verifyAndInstallGitopsPrimerOperator,
2424
} from '../../pages';
25+
import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
2526

2627
Given('user is at Add page', () => {
28+
checkDeveloperPerspective();
2729
navigateTo(devNavigationMenu.Add);
2830
});
2931

Diff for: ‎frontend/packages/dev-console/integration-tests/support/step-definitions/common/common.ts

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { modal } from '@console/cypress-integration-tests/views/modal';
55
import { nav } from '@console/cypress-integration-tests/views/nav';
66
import { switchPerspective, devNavigationMenu, adminNavigationMenu } from '../../constants';
77
import { perspective, projectNameSpace, navigateTo, app } from '../../pages';
8+
import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
89

910
Given('user has logged in as a basic user', () => {
1011
cy.logout();
@@ -17,6 +18,7 @@ Given('user has logged in as a basic user', () => {
1718
});
1819

1920
Given('user is at developer perspective', () => {
21+
checkDeveloperPerspective();
2022
perspective.switchTo(switchPerspective.Developer);
2123
// Due to bug ODC-6231
2224
// cy.testA11y('Developer perspective with guide tour modal');

Diff for: ‎frontend/packages/dev-console/integration-tests/support/step-definitions/getting-started/sample-card-add-page.ts

+3
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@ import {
1212
topologyPage,
1313
verifyAddPage,
1414
} from '../../pages';
15+
import { checkDeveloperPerspective } from '../../pages/functions/checkDeveloperPerspective';
1516

1617
Given('user is at developer perspective', () => {
18+
checkDeveloperPerspective();
1719
perspective.switchTo(switchPerspective.Developer);
1820
});
1921

@@ -22,6 +24,7 @@ Given('user has created or selected namespace {string}', (projectName: string) =
2224
});
2325

2426
Given('user is at Add page', () => {
27+
checkDeveloperPerspective();
2528
navigateTo(devNavigationMenu.Add);
2629
});
2730

Diff for: ‎frontend/packages/helm-plugin/integration-tests/support/step-definitions/common/common.ts

+3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import {
1717
catalogPage,
1818
addPage,
1919
} from '@console/dev-console/integration-tests/support/pages';
20+
import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective';
2021

2122
Given('user is at developer perspective', () => {
23+
checkDeveloperPerspective();
2224
perspective.switchTo(switchPerspective.Developer);
2325
// cy.testA11y('Developer perspective with guider tour modal');
2426
});
@@ -110,6 +112,7 @@ When('user clicks on the link for the {string} of helm release', (resource: stri
110112
});
111113

112114
Given('user is at Add page', () => {
115+
checkDeveloperPerspective();
113116
navigateTo(devNavigationMenu.Add);
114117
});
115118

Diff for: ‎frontend/packages/helm-plugin/integration-tests/support/step-definitions/helm/helm-navigation.ts

+2
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import {
1818
perspective,
1919
createForm,
2020
} from '@console/dev-console/integration-tests/support/pages';
21+
import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective';
2122
import { topologyPage } from '@console/topology/integration-tests/support/pages/topology/topology-page';
2223
import { helmPage, helmDetailsPage } from '../../pages';
2324

@@ -30,6 +31,7 @@ const deleteChartRepositoryFromDetailsPage = (name: string, type: string) => {
3031
};
3132

3233
Given('user is at developer perspective', () => {
34+
checkDeveloperPerspective();
3335
perspective.switchTo(switchPerspective.Developer);
3436
});
3537

Diff for: ‎frontend/packages/helm-plugin/integration-tests/support/step-definitions/helm/helm.ts

+2
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ import {
1919
projectNameSpace,
2020
app,
2121
} from '@console/dev-console/integration-tests/support/pages';
22+
import { checkDeveloperPerspective } from '@console/dev-console/integration-tests/support/pages/functions/checkDeveloperPerspective';
2223

2324
When('user selects YAML view', () => {
2425
cy.document().its('readyState').should('eq', 'complete');
@@ -80,6 +81,7 @@ Then('user will see A-Z, Z-A sort by dropdown', () => {
8081
});
8182

8283
Given('user is at Add page', () => {
84+
checkDeveloperPerspective();
8385
navigateTo(devNavigationMenu.Add);
8486
});
8587

Diff for: ‎frontend/packages/knative-plugin/integration-tests/features/admin-perspective/eventing-page-admin.feature

+9-5
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Feature: Eventing page at Administrator perspective
1010

1111
@regression
1212
Scenario: Create new Event Source: KA-01-TC01
13-
Given user has created knative service "hello-openshift"
13+
Given user has created knative service "hello-openshift" in admin
1414
And user is at administrator perspective
1515
And user is at eventing page
1616
When user clicks on Create dropdown button
@@ -20,8 +20,10 @@ Feature: Eventing page at Administrator perspective
2020
And user enters "* * * * *" in Schedule field
2121
And user selects resource "hello-openshift"
2222
And user clicks on Create button to submit
23-
Then user will be redirected to Project Details page
24-
And user will see ping-source created
23+
# Then user will be redirected to Project Details page
24+
# And user will see ping-source created
25+
Then user will be redirected to Topology page
26+
And ApiServerSource event source "ping-source" is created and linked to selected knative service "hello-openshift"
2527

2628

2729
@regression
@@ -31,8 +33,10 @@ Feature: Eventing page at Administrator perspective
3133
And user selects Channel
3234
And user selects Default channels
3335
And user clicks on Create button to create channel
34-
Then user will be redirected to Project Details page
35-
And user will see channel created
36+
# Then user will be redirected to Project Details page
37+
# And user will see channel created
38+
Then user will be redirected to Topology page
39+
And user will see the channel "channel" created
3640

3741

3842
@manual

Diff for: ‎frontend/packages/knative-plugin/integration-tests/features/admin-perspective/filters-serving-eventing-admin.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Filters on Serving and Eventing page
55

66
Background:
77
Given user has created or selected namespace "aut-serving-eventing"
8-
And user has created knative service "hello-openshift"
8+
And user has created knative service "hello-openshift" in admin
99
And user is at administrator perspective
1010

1111
@regression

Diff for: ‎frontend/packages/knative-plugin/integration-tests/features/admin-perspective/serving-page-admin.feature

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Feature: Serving page at Administrator perspective
55

66
Background:
77
Given user has created or selected namespace "aut-serving-page"
8-
And user has created knative service "hello-openshift"
8+
And user has created knative service "hello-openshift" in admin
99
And user is at administrator perspective
1010

1111

Diff for: ‎frontend/packages/knative-plugin/integration-tests/features/serverless/create-knative-workload.feature

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Feature: Create a workload of 'knative Service' type resource
44

55
Background:
66
Given user has created or selected namespace "aut-knative-workload"
7+
And user is at Add page
78

89

910
@regression

Diff for: ‎frontend/packages/knative-plugin/integration-tests/support/pages/admin-perspective/eventing-page.ts

+13-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { operatorsPage } from '@console/dev-console/integration-tests/support/pages';
1+
import { operatorsPage, topologyPage } from '@console/dev-console/integration-tests/support/pages';
22
import { eventingPO } from '@console/knative-plugin/integration-tests/support/pageObjects/global-po';
33

44
export const eventingSources = {
@@ -15,7 +15,8 @@ export const eventingSources = {
1515
cy.get(eventingPO.pingSource.resource).click();
1616
cy.get(eventingPO.pingSource.resourceItem).eq(0).click({ force: true });
1717
cy.get(eventingPO.pingSource.submit).click();
18-
cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
18+
// cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
19+
topologyPage.verifyTopologyPage();
1920
},
2021
createApiServerSource: () => {
2122
operatorsPage.navigateToEventingPage();
@@ -30,7 +31,8 @@ export const eventingSources = {
3031
cy.get(eventingPO.apiServerSource.resource).click();
3132
cy.get(eventingPO.apiServerSource.resourceItem).eq(0).click({ force: true });
3233
cy.get(eventingPO.apiServerSource.submit).click();
33-
cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
34+
// cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
35+
topologyPage.verifyTopologyPage();
3436
},
3537
createSinkBinding: () => {
3638
operatorsPage.navigateToEventingPage();
@@ -45,7 +47,8 @@ export const eventingSources = {
4547
cy.get(eventingPO.sinkBinding.resource).click();
4648
cy.get(eventingPO.sinkBinding.resourceItem).contains('openshift').click({ force: true });
4749
cy.get(eventingPO.sinkBinding.submit).click();
48-
cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
50+
// cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
51+
topologyPage.verifyTopologyPage();
4952
},
5053
createContainerSource: () => {
5154
operatorsPage.navigateToEventingPage();
@@ -59,7 +62,8 @@ export const eventingSources = {
5962
cy.get(eventingPO.containerSource.resource).click();
6063
cy.get(eventingPO.containerSource.resourceItem).contains('openshift').click({ force: true });
6164
cy.get(eventingPO.containerSource.submit).click();
62-
cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
65+
// cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
66+
topologyPage.verifyTopologyPage();
6367
},
6468
};
6569

@@ -71,7 +75,8 @@ export const eventingChannel = {
7175
cy.get(eventingPO.channel.typeField).click();
7276
cy.get(eventingPO.channel.createDropDownDefaultChannel).click();
7377
cy.get(eventingPO.channel.submit).click();
74-
cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
78+
// cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
79+
topologyPage.verifyTopologyPage();
7580
},
7681
createInMemoryChannel: () => {
7782
operatorsPage.navigateToEventingPage();
@@ -80,7 +85,8 @@ export const eventingChannel = {
8085
cy.get(eventingPO.channel.typeField).click();
8186
cy.get(eventingPO.channel.createDropDownInMemoryChannel).click();
8287
cy.get(eventingPO.channel.submit).click();
83-
cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
88+
// cy.get(eventingPO.pageDetails).should('include.text', 'Project details');
89+
topologyPage.verifyTopologyPage();
8490
},
8591
};
8692

Diff for: ‎frontend/packages/knative-plugin/integration-tests/support/step-definitions/admin-perspective/serving-page-admin.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ When('user clicks on Service button', () => {
4949
});
5050

5151
Then('user can see titles URL, Revision, Created, Conditions, Ready, Reason', () => {
52-
cy.get('[role="rowgroup"]')
52+
cy.get('[aria-label="Services"]')
53+
// cy.get('[role="rowgroup"]')
5354
.should('contain', 'URL')
5455
.and('contain', 'Revision')
5556
.and('contain', 'Created')
@@ -59,7 +60,8 @@ Then('user can see titles URL, Revision, Created, Conditions, Ready, Reason', ()
5960
});
6061

6162
Then('user can see titles Namespace, Service, Created, Conditions, Ready, Reason', () => {
62-
cy.get('[role="rowgroup"]')
63+
cy.get('[aria-label="Revisions"]')
64+
// cy.get('[role="rowgroup"]')
6365
.should('contain', 'Name')
6466
.and('contain', 'Service')
6567
.and('contain', 'Created')
@@ -69,7 +71,8 @@ Then('user can see titles Namespace, Service, Created, Conditions, Ready, Reason
6971
});
7072

7173
Then('user can see titles URL, Created, Conditions, Traffic', () => {
72-
cy.get('[role="rowgroup"]')
74+
cy.get('[aria-label="Routes"]')
75+
// cy.get('[role="rowgroup"]')
7376
.should('contain', 'URL')
7477
.and('contain', 'Created')
7578
.and('contain', 'Conditions')

Diff for: ‎frontend/packages/knative-plugin/integration-tests/support/step-definitions/common/common.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Given('user is at developer perspective', () => {
4141

4242
Given('user is at administrator perspective', () => {
4343
perspective.switchTo(switchPerspective.Administrator);
44-
cy.testA11y('Administrator perspective');
44+
// cy.testA11y('Administrator perspective');
4545
});
4646

4747
Given('user has created or selected namespace {string}', (projectName: string) => {
@@ -140,6 +140,15 @@ Given('user has created knative service {string}', (knativeServiceName: string)
140140
);
141141
});
142142

143+
Given('user has created knative service {string} in admin', (knativeServiceName: string) => {
144+
perspective.switchTo(switchPerspective.Administrator);
145+
createGitWorkloadIfNotExistsOnTopologyPage(
146+
'https://github.com/sclorg/nodejs-ex.git',
147+
knativeServiceName,
148+
resourceTypes.knativeService,
149+
);
150+
});
151+
143152
Given(
144153
'user has created knative revision with knative service {string}',
145154
(knativeServiceName: string) => {

0 commit comments

Comments
 (0)