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

cypress: fixed AUT failure part 1 #13686

Merged
merged 9 commits into from
Oct 25, 2023
Merged

cypress: fixed AUT failure part 1 #13686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
786fc88
cypress: fixed AUT failure part 1
ShaileshParmar11 Oct 23, 2023
863a9cf
updated DI spec
ShaileshParmar11 Oct 23, 2023
825aca9
Merge remote-tracking branch 'origin/main' into cypress-aut-failure-p…
ShaileshParmar11 Oct 25, 2023
39887a7
fixed postgress and redshift test
ShaileshParmar11 Oct 25, 2023
0899b24
Merge remote-tracking branch 'origin/main' into cypress-aut-failure-p…
ShaileshParmar11 Oct 25, 2023
e957770
fixed restore admin bug
ShaileshParmar11 Oct 25, 2023
3ebcfad
remove unnecessary type casing
ShaileshParmar11 Oct 25, 2023
470a28a
Merge branch 'main' into cypress-aut-failure-part1
ShaileshParmar11 Oct 25, 2023
0949f71
di test fixed
ShaileshParmar11 Oct 25, 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
20 changes: 12 additions & 8 deletions openmetadata-ui/src/main/resources/ui/cypress/common/serviceUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,17 @@
*/
import { interceptURL, verifyResponseStatusCode } from './common';

export const searchServiceFromSettingPage = (service) => {
interceptURL(
'GET',
'api/v1/search/query?q=*&from=0&size=15&index=*',
'searchService'
);
cy.get('[data-testid="searchbar"]').type(service);

verifyResponseStatusCode('@searchService', 200);
};

export const visitServiceDetailsPage = (service, verifyHeader = true) => {
// Click on settings page
interceptURL(
Expand All @@ -32,14 +43,7 @@ export const visitServiceDetailsPage = (service, verifyHeader = true) => {

cy.wait('@getServices');

interceptURL(
'GET',
'api/v1/search/query?q=*&from=0&size=*&index=*',
'searchService'
);
cy.get('[data-testid="searchbar"]').type(service.name);

verifyResponseStatusCode('@searchService', 200);
searchServiceFromSettingPage(service.name);

// click on created service
cy.get(`[data-testid="service-name-${service.name}"]`)
Expand Down
11 changes: 6 additions & 5 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsight.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const deleteKpiRequest = () => {
};

const checkSuccessStatus = (count = 1, timer = BASE_WAIT_TIME) => {
cy.get('[data-testid="ingestion-details-container"]')
cy.get('[data-testid="app-run-history-table"]')
.find('[data-testid="pipeline-status"]')
.as('checkRun');
// the latest run should be success
Expand Down Expand Up @@ -139,12 +139,12 @@ describe('Data Insight feature', () => {
interceptURL('GET', '/api/v1/apps?limit=*', 'apps');
interceptURL(
'GET',
'/api/v1/apps/name/DataInsightsApplication/runs?offset=*&limit=*',
'/api/v1/apps/name/DataInsightsApplication?fields=owner,pipelines',
'dataInsightsApplication'
);
interceptURL(
'POST',
'/api/v1/services/ingestionPipelines/deploy/*',
'/api/v1/apps/deploy/DataInsightsApplication',
'deploy'
);
interceptURL(
Expand All @@ -160,11 +160,12 @@ describe('Data Insight feature', () => {
).click();
verifyResponseStatusCode('@dataInsightsApplication', 200);
cy.get('[data-testid="deploy-button"]').click();
verifyResponseStatusCode('@triggerPipeline', 200);
verifyResponseStatusCode('@deploy', 200);
cy.reload();
verifyResponseStatusCode('@dataInsightsApplication', 200);
cy.get('[data-testid="run"]').click();
cy.get('[data-testid="run-now-button"]').click();
verifyResponseStatusCode('@triggerPipeline', 200);
cy.reload();
checkSuccessStatus();
});

Expand Down
3 changes: 2 additions & 1 deletion openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataInsightSettings.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import { BASE_URL } from '../../constants/constants';

const PIPELINE_NAME = 'cypress_dataInsight_pipeline';

describe('Data Insight settings page should work properly', () => {
// NOTE: need to re-write the test based on new UI
describe.skip('Data Insight settings page should work properly', () => {
beforeEach(() => {
cy.login();
interceptURL('GET', '/api/v1/teams/name/*', 'settingsPage');
Expand Down
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Glossary.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -275,7 +275,7 @@ const updateTags = (inTerm) => {
// visit glossary page
interceptURL(
'GET',
'/api/v1/search/query?q=disabled:false&index=tag_search_index&from=0&size=10&query_filter=%7B%7D',
'/api/v1/search/query?q=*&index=tag_search_index&from=0&size=*&query_filter=*',
'tags'
);
cy.get(
Expand Down
8 changes: 0 additions & 8 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Policies.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,14 +124,6 @@ describe('Policy page should work properly', () => {
.should('contain', policy)
.should('be.visible');
});
// Validate role is displayed
cy.get('[data-testid="role-link"]')
.contains(roles.dataConsumer)
.should('exist');

cy.get('[data-testid="role-link"]')
.contains(roles.dataSteward)
.should('exist');
});

it('Add new policy', () => {
Expand Down
21 changes: 6 additions & 15 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Service.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,9 @@ import {
interceptURL,
verifyResponseStatusCode,
} from '../../common/common';
import { searchServiceFromSettingPage } from '../../common/serviceUtils';
import { service } from '../../constants/constants';

const searchService = () => {
interceptURL(
'GET',
'api/v1/search/query?q=*&from=0&size=15&index=*',
'searchService'
);
cy.get('[data-testid="searchbar"]').type(service.name);

verifyResponseStatusCode('@searchService', 200);
};

describe('Services page should work properly', () => {
beforeEach(() => {
interceptURL(
Expand Down Expand Up @@ -60,7 +50,7 @@ describe('Services page should work properly', () => {
});

it('Update service description', () => {
searchService();
searchServiceFromSettingPage(service.name);
cy.get(`[data-testid="service-name-${service.name}"]`)
.should('be.visible')
.click();
Expand All @@ -78,11 +68,12 @@ describe('Services page should work properly', () => {
'[data-testid="description-container"] [data-testid="viewer-container"] [data-testid="markdown-parser"] :nth-child(1) .toastui-editor-contents p'
).contains(service.newDescription);
cy.get(':nth-child(1) > .link-title').click();
searchServiceFromSettingPage(service.name);
cy.get('.toastui-editor-contents > p').contains(service.newDescription);
});

it('Update owner and check description', () => {
searchService();
searchServiceFromSettingPage(service.name);
cy.get(`[data-testid="service-name-${service.name}"]`)
.should('be.visible')
.click();
Expand Down Expand Up @@ -129,7 +120,7 @@ describe('Services page should work properly', () => {
// Checking if description exists after assigning the owner
cy.get(':nth-child(1) > .link-title').click();
// need wait here

searchServiceFromSettingPage(service.name);
cy.get('[data-testid="viewer-container"]').contains(service.newDescription);
});

Expand All @@ -141,7 +132,7 @@ describe('Services page should work properly', () => {
);

interceptURL('GET', '/api/v1/users?*', 'waitForUsers');
searchService();
searchServiceFromSettingPage(service.name);
cy.get(`[data-testid="service-name-${service.name}"]`)
.should('be.visible')
.click();
Expand Down
4 changes: 3 additions & 1 deletion openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Tags.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,9 @@ describe('Tags page should work', () => {
)
.click()
.type(assignee);
cy.get('.ant-select-item-option-content').contains(assignee).click();
cy.get(`[data-testid="assignee-option-${assignee}"]`)
.scrollIntoView()
.click();

// click outside the select box
cy.clickOutside();
Expand Down
2 changes: 2 additions & 0 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/Teams.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,8 @@ describe('Teams flow should work properly', () => {
.should('be.visible')
.should('contain', TEAM_DETAILS.updatedName);

cy.get('[role="tablist"] [data-icon="right"]').click();

// Click on edit description button
cy.get('[data-testid="edit-description"]')
.should('be.visible')
Expand Down
10 changes: 9 additions & 1 deletion openmetadata-ui/src/main/resources/ui/cypress/e2e/Service/postgres.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,16 @@ describe('Postgres Ingestion', () => {
'/api/v1/services/ingestionPipelines/deploy/*',
'deployIngestion'
);
interceptURL(
'GET',
'/api/v1/permissions/ingestionPipeline/name/*',
'ingestionPermissions'
);

visitServiceDetailsPage({ type: serviceType, name: serviceName });
visitServiceDetailsPage(
{ type: SERVICE_TYPE.Database, name: serviceName },
false
);

cy.get('[data-testid="ingestions"]')
.scrollIntoView()
Expand Down
2 changes: 2 additions & 0 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Service/redshiftWithDBT.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import {
verifyResponseStatusCode,
visitEntityDetailsPage,
} from '../../common/common';
import { searchServiceFromSettingPage } from '../../common/serviceUtils';
import {
API_SERVICE,
DBT,
Expand Down Expand Up @@ -136,6 +137,7 @@ describe('RedShift Ingestion', () => {
);
interceptURL('GET', '/api/v1/services/*/name/*', 'serviceDetails');
interceptURL('GET', '/api/v1/databases?*', 'databases');
searchServiceFromSettingPage(REDSHIFT.serviceName);
cy.get(`[data-testid="service-name-${REDSHIFT.serviceName}"]`)
.should('exist')
.click();
Expand Down
2 changes: 1 addition & 1 deletion ...main/resources/ui/src/components/Applications/AppRunsHistory/AppRunsHistory.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ const AppRunsHistory = forwardRef(

return (
<StatusBadge
dataTestId={record.appId + '-status'}
dataTestId="pipeline-status"
label={capitalize(record.status)}
status={status}
/>
Expand Down
8 changes: 2 additions & 6 deletions openmetadata-ui/src/main/resources/ui/src/pages/UserListPage/UserListPageV1.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,8 @@ import { SearchIndex } from '../../enums/search.enum';
import { User } from '../../generated/entity/teams/user';
import { Include } from '../../generated/type/include';
import { Paging } from '../../generated/type/paging';
import { SearchResponse } from '../../interface/search.interface';
import { searchData } from '../../rest/miscAPI';
import { getUsers, UsersQueryParams } from '../../rest/userAPI';
import { formatUsersResponse } from '../../utils/APIUtils';
import { showErrorToast } from '../../utils/ToastUtils';

const teamsAndUsers = [GlobalSettingOptions.USERS, GlobalSettingOptions.ADMINS];
Expand Down Expand Up @@ -118,9 +116,7 @@ const UserListPageV1 = () => {
isDeleted
)
.then((res) => {
const data = formatUsersResponse(
(res.data as SearchResponse<SearchIndex.USER>).hits.hits
);
const data = res.data.hits.hits.map(({ _source }) => _source);
setPaging({
total: res.data.hits.total.value,
});
Expand All @@ -143,7 +139,7 @@ const UserListPageV1 = () => {

userQuerySearch(value, pageNumber, isAdminPage, showDeletedUser).then(
(resUsers) => {
setUserList(resUsers as unknown as User[]);
setUserList(resUsers);
setIsDataLoading(false);
}
);
Expand Down
Loading