Merge branch 'feat/grid-revamp' of https://github.com/ToolJet/ToolJet into feat/grid-revamp

This commit is contained in:
Johnson Cherian 2024-03-12 09:44:03 +05:30
commit 654bc70e2f
3 changed files with 10 additions and 10 deletions

View file

@ -117,7 +117,7 @@ describe("Data sources MySql", () => {
fillDataSourceTextField(
postgreSqlText.labelPort,
postgreSqlText.placeholderEnterPort,
"3306"
"3318"
);
fillDataSourceTextField(
postgreSqlText.labelDbName,
@ -141,7 +141,7 @@ describe("Data sources MySql", () => {
fillDataSourceTextField(
postgreSqlText.labelDbName,
postgreSqlText.placeholderNameOfDB,
"testdv"
"test_db"
);
fillDataSourceTextField(
postgreSqlText.labelUserName,
@ -210,7 +210,7 @@ describe("Data sources MySql", () => {
fillConnectionForm({
Host: Cypress.env("mysql_host"),
Port: Cypress.env("mysql_port"),
"Database Name": "testdv",
"Database Name": "test_db",
Username: Cypress.env("mysql_user"),
Password: Cypress.env("mysql_password"),
});
@ -388,7 +388,7 @@ describe("Data sources MySql", () => {
fillConnectionForm({
Host: Cypress.env("mysql_host"),
Port: Cypress.env("mysql_port"),
"Database Name": "testdv",
"Database Name": "test_db",
Username: Cypress.env("mysql_user"),
Password: Cypress.env("mysql_password"),
});
@ -421,7 +421,7 @@ describe("Data sources MySql", () => {
cy.get(".p-3").should(
"have.text",
`[{"Tables_in_testdv (${dbName})":"${dbName}"}]`
`[{"Tables_in_test_db (${dbName})":"${dbName}"}]`
);
// addQuery(
@ -462,8 +462,8 @@ describe("Data sources MySql", () => {
);
fillConnectionForm({
Host: Cypress.env("mysql_host"),
Port: "3306",
"Database Name": "testdv",
Port: "3318",
"Database Name": "test_db",
Username: Cypress.env("mysql_user"),
Password: Cypress.env("mysql_password"),
});

View file

@ -1,5 +1,5 @@
import { commonSelectors } from "../../constants/selectors/common";
import { commonText } from "../../constants/texts/common";
import { commonSelectors } from "Selectors/common";
import { commonText } from "Texts/common";
import { fake } from "Fixtures/fake";
import { addNewUser } from "Support/utils/onboarding";
import { logout } from "Support/utils/common";

View file

@ -9,7 +9,7 @@ import { dashboardSelector } from "Selectors/dashboard";
import { updateWorkspaceName } from "Support/utils/userPermissions";
import { groupsSelector } from "Selectors/manageGroups";
import { groupsText } from "Texts/manageGroups";
import { addNewUser } from "../../support/utils/onboarding";
import { addNewUser } from "Support/utils/onboarding";
const data = {};
data.groupName = fake.firstName.replaceAll("[^A-Za-z]", "");