test: Cypress | CI Stabilize (#27202)

## Description
- This PR updates the Mongo fill method from js to ts
[fillMongoDatasourceForm to FillMongoDSForm]
- Updates mongo_databaseName to match the prod & staging ds names
- Removes unused fillMongoDatasourceForm, fillMongoDatasourceFormWithURI
js support methods
- Removed ElasticSearch_Basic_Spec.ts from PR runs & be done only in
Scheduled runs

#### Type of change
- Script fix (non-breaking change which fixes an issue)

## Testing
>
#### How Has This Been Tested?

- [X] Cypress CI runs

## Checklist:
#### QA activity:
- [X] Added `Test Plan Approved` label after Cypress tests were reviewed
This commit is contained in:
Aishwarya-U-R 2023-09-12 17:33:51 +05:30 committed by GitHub
parent 01c90f1df1
commit a44a9a781c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 20 additions and 55 deletions

View File

@ -110,7 +110,7 @@ describe("Git import flow ", function () {
cy.wait(500);
cy.ReconnectDatasource("TEDMongo");
cy.wait(500);
cy.fillMongoDatasourceForm();
dataSources.FillMongoDSForm();
cy.get(datasourceEditor.sectionAuthentication).click();
cy.testDatasource(true);
agHelper.GetNClick(dataSources._saveDs);

View File

@ -7,6 +7,7 @@ import {
onboarding,
draggableWidgets,
debuggerHelper,
dataSources,
} from "../../../../support/Objects/ObjectsCore";
const datasource = require("../../../../locators/DatasourcesEditor.json");
@ -118,7 +119,7 @@ describe("FirstTimeUserOnboarding", function () {
cy.get(OnboardingLocator.checklistDatasourceBtn).click();
cy.get(OnboardingLocator.datasourcePage).should("be.visible");
cy.get(datasource.MongoDB).click();
cy.fillMongoDatasourceForm();
dataSources.FillMongoDSForm();
cy.generateUUID().then((uid) => {
datasourceName = `Mongo CRUD ds ${uid}`;
cy.renameDatasource(datasourceName);

View File

@ -92,7 +92,7 @@ describe("Validate Elasticsearch DS", () => {
agHelper.PressEnter();
agHelper.Sleep();
agHelper.Sleep(2000);
dataSources.RunQuery();
cy.get("@postExecute").then((resObj: any) => {
expect(
@ -143,6 +143,13 @@ describe("Validate Elasticsearch DS", () => {
directInput: false,
inputFieldName: "Body",
});
agHelper
.GetElement(dataSources._bodyCodeMirror)
.type("{downarrow}".repeat(5));
agHelper.PressEnter();
agHelper.Sleep(2000);
dataSources.RunQuery();
cy.get("@postExecute").then((resObj: any) => {

View File

@ -1,6 +1,5 @@
const queryLocators = require("../../../../locators/QueryEditor.json");
const generatePage = require("../../../../locators/GeneratePage.json");
const datasource = require("../../../../locators/DatasourcesEditor.json");
const formControls = require("../../../../locators/FormControl.json");
import {
@ -27,18 +26,14 @@ describe("Validate Mongo query commands", function () {
// });
before("Creates a new Mongo datasource", function () {
cy.NavigateToDatasourceEditor();
cy.get(datasource.MongoDB).click();
cy.fillMongoDatasourceForm();
cy.generateUUID().then((uid) => {
datasourceName = `Mongo CRUD ds ${uid}`;
cy.renameDatasource(datasourceName);
dataSources.CreateDataSource("Mongo");
dataSources.CreateQueryAfterDSSaved();
cy.get("@dsName").then(($dsName) => {
datasourceName = $dsName;
});
cy.testSaveDatasource();
});
it("1. Validate Raw query command, run and then delete the query", function () {
cy.NavigateToActiveDSQueryPane(datasourceName);
// cy.get("@getPluginForm").should(
// "have.nested.property",
// "response.body.responseMeta.status",

View File

@ -10,7 +10,7 @@ export class DataManager {
mongo_authenticationAuthtype: "SCRAM-SHA-1",
mongo_host: "host.docker.internal",
mongo_port: 28017,
mongo_databaseName: "mongo_samples",
mongo_databaseName: "mongo_prod",
postgres_host: "host.docker.internal",
postgres_port: 5432,
@ -104,7 +104,7 @@ export class DataManager {
mongo_authenticationAuthtype: "SCRAM-SHA-1",
mongo_host: "host.docker.internal",
mongo_port: 28017,
mongo_databaseName: "mongo_samples2",
mongo_databaseName: "mongo_staging",
postgres_host: "host.docker.internal",
postgres_port: 5432,

View File

@ -85,39 +85,6 @@ Cypress.Commands.add("testSaveDatasource", (expectedRes = true) => {
// .click();
});
Cypress.Commands.add(
"fillMongoDatasourceForm",
(shouldAddTrailingSpaces = false) => {
const hostAddress = shouldAddTrailingSpaces
? datasourceFormData["mongo-host"] + " "
: datasourceFormData["mongo-host"];
// const databaseName = shouldAddTrailingSpaces
// ? datasourceFormData["mongo-databaseName"] + " "
// : datasourceFormData["mongo-databaseName"];
cy.get(datasourceEditor["host"]).clear().type(hostAddress);
cy.get(datasourceEditor.port)
.clear()
.type(datasourceFormData["mongo-port"]);
//cy.get(datasourceEditor["port"]).type(datasourceFormData["mongo-port"]);
//cy.get(datasourceEditor["selConnectionType"]).click();
//cy.contains(datasourceFormData["connection-type"]).click();
//cy.get(datasourceEditor["defaultDatabaseName"]).type(databaseName);//is optional hence removing
cy.get(datasourceEditor["databaseName"])
.clear()
.type(datasourceFormData["mongo-databaseName"]);
// cy.get(datasourceEditor["username"]).type(
// datasourceFormData["mongo-username"],
// );
// cy.get(datasourceEditor["password"]).type(
// datasourceFormData["mongo-password"],
// );
// cy.get(datasourceEditor["authenticationAuthtype"]).click();
// cy.contains(datasourceFormData["mongo-authenticationAuthtype"]).click({
// force: true,
// });
},
);
Cypress.Commands.add(
"fillPostgresDatasourceForm",
(shouldAddTrailingSpaces = false) => {
@ -334,14 +301,6 @@ Cypress.Commands.add("createAmazonS3Datasource", () => {
cy.testSaveDatasource();
});
Cypress.Commands.add("fillMongoDatasourceFormWithURI", () => {
cy.xpath(datasourceEditor["mongoUriDropdown"]).click().wait(500);
cy.xpath(datasourceEditor["mongoUriYes"]).click().wait(500);
cy.xpath(datasourceEditor["mongoUriInput"]).type(
datasourceFormData["mongo-uri"],
);
});
Cypress.Commands.add("ReconnectDatasource", (datasource) => {
cy.xpath(`//span[text()='${datasource}']`).click();
});

View File

@ -34,6 +34,7 @@ export default defineConfig({
"cypress/e2e/**/spec_utility.ts",
"cypress/e2e/GSheet/**/**/*",
"cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts",
"cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts",
],
},
});

View File

@ -55,6 +55,7 @@ export default defineConfig({
"cypress/e2e/GSheet/**/**/*",
"cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts",
"cypress/e2e/EE/Enterprise/MultipleEnv/ME_airtable_spec.ts",
"cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts",
],
},
});

View File

@ -52,6 +52,7 @@ export default defineConfig({
specPattern: [
"cypress/e2e/Sanity/Datasources/Airtable_Basic_Spec.ts",
"cypress/e2e/GSheet/**/**/*",
"cypress/e2e/Regression/ServerSide/Datasources/ElasticSearch_Basic_Spec.ts",
],
testIsolation: false,
excludeSpecPattern: ["cypress/e2e/**/spec_utility.ts"],