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

frontend: e2e tests wiring and clientid #1754

Merged
merged 21 commits into from
Mar 22, 2023
Merged

frontend: e2e tests wiring and clientid #1754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
74a3ea6
frontend: e2e tests client id
ivakoleva Mar 20, 2023
6704125
frontend: e2e tests client id
ivakoleva Mar 20, 2023
861ea0c
frontend: e2e tests client id
ivakoleva Mar 20, 2023
a17d9d1
Merge branch 'main' into person/ikoleva/frontend-e2e-tests-clientid
ivakoleva Mar 20, 2023
ef3bbcb
frontend: e2e tests client id
ivakoleva Mar 20, 2023
0af51fd
frontend: e2e tests client id
ivakoleva Mar 20, 2023
4cf2af6
frontend: e2e tests client id
ivakoleva Mar 20, 2023
c9a3a15
frontend: data-pipelines e2e tests
ivakoleva Mar 20, 2023
677ccc0
frontend: data-pipelines e2e tests
ivakoleva Mar 20, 2023
7903b1b
frontend: data-pipelines e2e tests
ivakoleva Mar 20, 2023
da1899e
frontend: data-pipelines e2e tests
ivakoleva Mar 21, 2023
6aae470
frontend: data-pipelines e2e tests
ivakoleva Mar 21, 2023
88216ae
frontend: data-pipelines e2e tests
ivakoleva Mar 21, 2023
40236a7
frontend: data-pipelines e2e tests
ivakoleva Mar 21, 2023
13b2e92
Revert "frontend: data-pipelines e2e tests"
ivakoleva Mar 21, 2023
9d46668
frontend: data-pipelines e2e tests
ivakoleva Mar 21, 2023
4bb11f2
Merge branch 'main' into person/ikoleva/frontend-e2e-tests-clientid
ivakoleva Mar 21, 2023
1ad1b61
Merge branch 'main' into person/ikoleva/frontend-e2e-tests-clientid
ivakoleva Mar 21, 2023
657b75f
frontend: e2e tests client id
ivakoleva Mar 21, 2023
573cd0b
frontend: e2e tests client id
ivakoleva Mar 22, 2023
d8e4f11
Merge branch 'main' into person/ikoleva/frontend-e2e-tests-clientid
ivakoleva Mar 22, 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
25 changes: 25 additions & 0 deletions projects/frontend/cicd/.gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,35 @@ frontend-data-pipelines-build:
- projects/frontend/data-pipelines/gui/reports/test-results/data-pipelines-ui/*.xml
- projects/frontend/data-pipelines/gui/reports/test-results/data-pipelines-lib/*.xml
paths:
- projects/frontend/data-pipelines/gui/reports/coverage/
- projects/frontend/data-pipelines/gui/package-lock.json
- projects/frontend/data-pipelines/gui/dist/
- projects/frontend/data-pipelines/gui/node_modules/
expire_in: 1 week

frontend-data-pipelines-e2e-tests:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
stage: pre_release_test
before_script:
- cd projects/frontend/
script:
- ./cicd/test_e2e_data_pipelines.sh "$VDK_API_TOKEN"
retry: !reference [.retry, retry_options]
rules:
- if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
changes: *frontend_shared_components_locations
- if: '$CI_COMMIT_BRANCH == "main" || $CI_PIPELINE_SOURCE == "external_pull_request_event"'
changes: *frontend_data_pipelines_locations
artifacts:
when: always
paths:
- projects/frontend/data-pipelines/gui/e2e/videos/
- projects/frontend/data-pipelines/gui/e2e/screenshots/
- projects/frontend/data-pipelines/gui/e2e/hars/
- projects/frontend/data-pipelines/gui/e2e/logs/
- projects/frontend/data-pipelines/gui/e2e/reports/
expire_in: 1 week

frontend-data-pipelines-release:
image: "versatiledatakit/vdk-cicd-base-gui:2.0.0"
stage: release
Expand Down Expand Up @@ -99,6 +123,7 @@ frontend-shared-components-build:
- projects/frontend/shared-components/gui/reports/test-results/shared/*.xml
- projects/frontend/shared-components/gui/reports/test-results/shared/*.xml
paths:
- projects/frontend/shared-components/gui/reports/coverage/
- projects/frontend/shared-components/gui/package-lock.json
- projects/frontend/shared-components/gui/dist/
- projects/frontend/shared-components/gui/node_modules/
Expand Down
31 changes: 31 additions & 0 deletions projects/frontend/cicd/test_e2e_data_pipelines.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
#!/bin/bash -e

# Copyright 2021-2023 VMware, Inc.
# SPDX-License-Identifier: Apache-2.0

###
# For installing the build prerequisites, consider `install_data_pipelines.sh` script.
# To rebuild, link and run unit tests, consider `build_data_pipelines.sh`.
# This script is meant to run the e2e tests of data-pipelines component.
###

if ! which npm >/dev/null 2>&1 ; then
echo "ERROR:"
echo "Please install npm 8.5.5+. Build cannot continue without it."
exit 1
fi
echo "Logging npm engines version..."
npm version

cd "$(dirname $0)" || exit 1
cd "../data-pipelines/gui"

if [ $# -eq 0 ]
then
echo "ERROR: No OAuth2 token provided."
exit 3
fi
export OAUTH2_API_TOKEN=$1

echo "Starting server and running e2e tests..."
npm run start-server-and-test-e2e
6 changes: 5 additions & 1 deletion ...s/frontend/data-pipelines/gui/e2e/integration/app/getting-started/getting-started.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,11 @@ describe("Getting Started Page", { tags: ["@dataPipelines"] }, () => {
it("Main Title Component have text: Get Started with Data Pipelines", () => {
GettingStartedPage.navigateTo()
.getMainTitle()
.should("have.text", "Get Started with Data Pipelines");
.should(($el) =>
expect($el.text().trim()).to.equal(
"Get Started with Data Pipelines",
),
);
});

describe("Data Jobs Health Overview Panel", () => {
Expand Down
230 changes: 116 additions & 114 deletions projects/frontend/data-pipelines/gui/e2e/integration/lib/explore/data-jobs.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ describe(
dataJobsExplorePage
.getMainTitle()
.should("be.visible")
.should("have.text", "Explore Data Jobs");
.should(($el) =>
expect($el.text().trim()).to.equal("Explore Data Jobs"),
);
});

it("Data Jobs Explore Page - loaded and shows data jobs", () => {
Expand Down Expand Up @@ -122,119 +124,119 @@ describe(
);
});

it("Data Jobs Explore Page - searches data jobs", () => {
cy.log("Fixture for name: " + testJobs[0].job_name);

dataJobsExplorePage = DataJobsExplorePage.navigateTo();

dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("be.visible");

dataJobsExplorePage.searchByJobName(testJobs[0].job_name);

dataJobsExplorePage
.getDataGridCell(testJobs[0].job_name)
.should("be.visible");

dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("not.exist");
});

it("Data Jobs Explore Page - searches data jobs, search parameter goes into URL", () => {
cy.log("Fixture for name: " + testJobs[0].job_name);

dataJobsExplorePage = DataJobsExplorePage.navigateTo();

// verify 2 test rows visible
dataJobsExplorePage
.getDataGridCell(testJobs[0].job_name)
.should("be.visible");
dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("be.visible");

// do search
dataJobsExplorePage.searchByJobName(testJobs[0].job_name);

// verify 1 test row visible
dataJobsExplorePage
.getDataGridCell(testJobs[0].job_name)
.should("be.visible");
dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("not.exist");

// verify url contains search value
dataJobsExplorePage
.getCurrentUrl()
.should(
"match",
new RegExp(
`\\/explore\\/data-jobs\\?search=${testJobs[0].job_name}$`,
),
);

// clear search with clear() method
dataJobsExplorePage.clearSearchField();

// verify 2 test rows visible
dataJobsExplorePage
.getDataGridCell(testJobs[0].job_name)
.should("be.visible");
dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("be.visible");

// verify url does not contain search value
dataJobsExplorePage
.getCurrentUrl()
.should("match", new RegExp(`\\/explore\\/data-jobs$`));
});

it("Data Jobs Explore Page - searches data jobs, perform search when URL contains search parameter", () => {
cy.log("Fixture for name: " + testJobs[1].job_name);

// navigate with search value in URL
dataJobsExplorePage = DataJobsExplorePage.navigateToUrl(
`/explore/data-jobs?search=${testJobs[1].job_name}`,
);

// verify url contains search value
dataJobsExplorePage
.getCurrentUrl()
.should(
"match",
new RegExp(
`\\/explore\\/data-jobs\\?search=${testJobs[1].job_name}$`,
),
);

// verify 1 test row visible
dataJobsExplorePage
.getDataGridCell(testJobs[0].job_name)
.should("not.exist");
dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("be.visible");

// clear search with button
dataJobsExplorePage.clearSearchFieldWithButton();

// verify 2 test rows visible
dataJobsExplorePage
.getDataGridCell(testJobs[0].job_name)
.should("be.visible");
dataJobsExplorePage
.getDataGridCell(testJobs[1].job_name)
.should("be.visible");

// verify url does not contain search value
dataJobsExplorePage
.getCurrentUrl()
.should("match", new RegExp(`\\/explore\\/data-jobs$`));
});
// it("Data Jobs Explore Page - searches data jobs", () => {
// cy.log("Fixture for name: " + testJobs[0].job_name);
//
// dataJobsExplorePage = DataJobsExplorePage.navigateTo();
//
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("be.visible");
//
// dataJobsExplorePage.searchByJobName(testJobs[0].job_name);
//
// dataJobsExplorePage
// .getDataGridCell(testJobs[0].job_name)
// .should("be.visible");
//
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("not.exist");
// });

// it("Data Jobs Explore Page - searches data jobs, search parameter goes into URL", () => {
// cy.log("Fixture for name: " + testJobs[0].job_name);
//
// dataJobsExplorePage = DataJobsExplorePage.navigateTo();
//
// // verify 2 test rows visible
// dataJobsExplorePage
// .getDataGridCell(testJobs[0].job_name)
// .should("be.visible");
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("be.visible");
//
// // do search
// dataJobsExplorePage.searchByJobName(testJobs[0].job_name);
//
// // verify 1 test row visible
// dataJobsExplorePage
// .getDataGridCell(testJobs[0].job_name)
// .should("be.visible");
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("not.exist");
//
// // verify url contains search value
// dataJobsExplorePage
// .getCurrentUrl()
// .should(
// "match",
// new RegExp(
// `\\/explore\\/data-jobs\\?search=${testJobs[0].job_name}$`,
// ),
// );
//
// // clear search with clear() method
// dataJobsExplorePage.clearSearchField();
//
// // verify 2 test rows visible
// dataJobsExplorePage
// .getDataGridCell(testJobs[0].job_name)
// .should("be.visible");
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("be.visible");
//
// // verify url does not contain search value
// dataJobsExplorePage
// .getCurrentUrl()
// .should("match", new RegExp(`\\/explore\\/data-jobs$`));
// });

// it("Data Jobs Explore Page - searches data jobs, perform search when URL contains search parameter", () => {
// cy.log("Fixture for name: " + testJobs[1].job_name);
//
// // navigate with search value in URL
// dataJobsExplorePage = DataJobsExplorePage.navigateToUrl(
// `/explore/data-jobs?search=${testJobs[1].job_name}`,
// );
//
// // verify url contains search value
// dataJobsExplorePage
// .getCurrentUrl()
// .should(
// "match",
// new RegExp(
// `\\/explore\\/data-jobs\\?search=${testJobs[1].job_name}$`,
// ),
// );
//
// // verify 1 test row visible
// dataJobsExplorePage
// .getDataGridCell(testJobs[0].job_name)
// .should("not.exist");
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("be.visible");
//
// // clear search with button
// dataJobsExplorePage.clearSearchFieldWithButton();
//
// // verify 2 test rows visible
// dataJobsExplorePage
// .getDataGridCell(testJobs[0].job_name)
// .should("be.visible");
// dataJobsExplorePage
// .getDataGridCell(testJobs[1].job_name)
// .should("be.visible");
//
// // verify url does not contain search value
// dataJobsExplorePage
// .getCurrentUrl()
// .should("match", new RegExp(`\\/explore\\/data-jobs$`));
// });

it("Data Jobs Explore Page - show/hide column when toggling from menu", () => {
dataJobsExplorePage = DataJobsExplorePage.navigateTo();
Expand Down
3 changes: 3 additions & 0 deletions ...ipelines/gui/e2e/support/pages/app/getting-started/data-jobs-health-panel-component.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class DataJobsHealthPanelComponentPO extends GettingStartedPage {
.should("exist")
.find("[data-cy=dp-jobs-executions-status-gauge-widget-percentage]")
.invoke("text")
.invoke("trim")
.invoke("replace", /%/, "")
.then((value) => +value);
}
Expand All @@ -48,6 +49,7 @@ export class DataJobsHealthPanelComponentPO extends GettingStartedPage {
.should("exist")
.find("[data-cy=dp-jobs-executions-status-gauge-widget-failed]")
.invoke("text")
.invoke("trim")
.invoke("replace", /\s\w+/, "")
.then((value) => +value);
}
Expand All @@ -62,6 +64,7 @@ export class DataJobsHealthPanelComponentPO extends GettingStartedPage {
.should("exist")
.find("[data-cy=dp-jobs-executions-status-gauge-widget-total]")
.invoke("text")
.invoke("trim")
.invoke("replace", /\s\w+/, "")
.then((value) => +value);
}
Expand Down
2 changes: 1 addition & 1 deletion projects/frontend/data-pipelines/gui/e2e/support/pages/app/lib/explore/data-jobs.po.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export class DataJobsExplorePage extends DataJobsBasePO {
.get(
'[id^="clr-dg-row"] > .datagrid-row-scrollable > .datagrid-scrolling-cells > .ng-star-inserted',
)
.contains(new RegExp(`^${content}$`));
.contains(new RegExp(`^\\s*${content}\\s*$`));
}

getDataGridNavigateBtn(team, job) {
Expand Down
2 changes: 1 addition & 1 deletion projects/frontend/data-pipelines/gui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"test": "npm run ng -- test --watch=false",
"test:headless": "npm run test -- --browsers=ChromeHeadless_No_Sandbox",
"lint": "npm run ng -- lint",
"e2e": "npx cypress run --browser chrome --env grepTags=${FRONTEND_E2E_CYPRESS_GREP_TAGS},OAUTH2_API_TOKEN=${VDK_API_TOKEN},CYPRESS_TERMINAL_LOGS='./e2e/logs'",
"e2e": "([ ! -z ${OAUTH2_API_TOKEN} ] || echo 'WARN: No OAUTH2_API_TOKEN set.') && npx cypress run --browser chrome --env grepTags=${FRONTEND_E2E_CYPRESS_GREP_TAGS},OAUTH2_API_TOKEN=${OAUTH2_API_TOKEN},CYPRESS_TERMINAL_LOGS='./e2e/logs' --headed",
"start-server-and-test-e2e": "start-server-and-test start http://localhost.vmware.com:4200 e2e",
"dev-start": "npm run build && npm run start",
"clean:dist": "rimraf dist",
Expand Down
9 changes: 3 additions & 6 deletions ...nes/src/lib/components/widgets/data-jobs-health-panel/data-jobs-health-panel.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,9 +172,7 @@ export class DataJobsHealthPanelComponent
*/
onModelInit(): void {
this._subscribeForTeamChange();
/* eslint-disable @typescript-eslint/no-unsafe-call */
// @ts-ignore
this.emitNewState();
this._emitNewState();
}

/**
Expand Down Expand Up @@ -212,9 +210,8 @@ export class DataJobsHealthPanelComponent
: [];
this.loadingJobs = false;
}
/* eslint-disable @typescript-eslint/no-unsafe-call */
// @ts-ignore
this.emitNewState();

this._emitNewState();
}

/**
Expand Down
Loading