Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

merge resolution with master

Browse Source
This commit is contained in:
manish kumar 2023-05-30 10:18:50 +05:30
parent e551a76e8b
commit ce05e566ca
3 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_JS_spec.ts
View File

@ -68,7 +68,6 @@ describe("Autocomplete tests", () => {
it("2. Check for bindings not available in other page", () => { it("2. Check for bindings not available in other page", () => {
// dependent on above case: 1st page should have DocumentViewer widget // dependent on above case: 1st page should have DocumentViewer widget
_.entityExplorer.AddNewPage(); _.entityExplorer.AddNewPage();
// create js object // create js object
_.jsEditor.CreateJSObject(jsObjectBody, { _.jsEditor.CreateJSObject(jsObjectBody, {
paste: true, paste: true,
@ -300,7 +299,6 @@ describe("Autocomplete tests", () => {
it("8. Multiple binding in single line", () => { it("8. Multiple binding in single line", () => {
_.dataSources.CreateDataSource("Postgres", true, false); _.dataSources.CreateDataSource("Postgres", true, false);
_.dataSources.CreateQueryAfterDSSaved( _.dataSources.CreateQueryAfterDSSaved(
"SELECT * FROM worldCountryInfo where {{appsmith.store}} {{appsmith}}", "SELECT * FROM worldCountryInfo where {{appsmith.store}} {{appsmith}}",
); );

1
app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
View File

@ -71,7 +71,6 @@ describe("Modal focus", function () {
}); });
it("2. Should not focus on the input field if autofocus is disabled", () => { it("2. Should not focus on the input field if autofocus is disabled", () => {
cy.openPropertyPaneFromModal("inputwidgetv2"); cy.openPropertyPaneFromModal("inputwidgetv2");
// autofocus for input field is disabled // autofocus for input field is disabled
cy.get(".t--property-control-autofocus") cy.get(".t--property-control-autofocus")
.find(".ads-v2-switch") .find(".ads-v2-switch")

2
deploy/docker/entrypoint.sh Executable file → Normal file
View File

@ -336,7 +336,6 @@ init_postgres() {
echo "Found existing Postgres, Skipping initialization" echo "Found existing Postgres, Skipping initialization"
else else
echo "Initializing local postgresql database" echo "Initializing local postgresql database"
mkdir -p $POSTGRES_DB_PATH mkdir -p $POSTGRES_DB_PATH
# Postgres does not allow it's server to be run with super user access, we use user postgres and the file system owner also needs to be the same user postgres # Postgres does not allow it's server to be run with super user access, we use user postgres and the file system owner also needs to be the same user postgres
@ -350,7 +349,6 @@ init_postgres() {
# Create mockdb db and user and populate it with the data # Create mockdb db and user and populate it with the data
seed_embedded_postgres seed_embedded_postgres
# Stop the postgres daemon # Stop the postgres daemon
su postgres -c "/usr/lib/postgresql/13/bin/pg_ctl stop -D $POSTGRES_DB_PATH" su postgres -c "/usr/lib/postgresql/13/bin/pg_ctl stop -D $POSTGRES_DB_PATH"
fi fi