diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml index 1241020f3a..2be864f7e7 100644 --- a/.github/workflows/ci-test-limited.yml +++ b/.github/workflows/ci-test-limited.yml @@ -115,7 +115,7 @@ jobs: echo "::set-output name=run_result::$run_result_env" # In case this is second attempt try restoring failed tests - - if : steps.run_result.outputs.run_result == 'failedtest' + - if: steps.run_result.outputs.run_result == 'failedtest' run: echo "failed_spec_artifact=failed-spec-ci-$((${{github.run_attempt}}-1))" >> $GITHUB_ENV - name: Restore the previous failed combine result if: steps.run_result.outputs.run_result == 'failedtest' @@ -228,6 +228,9 @@ jobs: -e ENTERPRISE_USER_PASSWORD=ent_user_password \ -e ENTERPRISE_ADMIN_NAME=ent-admin@appsmith.com \ -e ENTERPRISE_ADMIN_PASSWORD=ent_admin_password \ + -e FLAGSMITH_URL=http://host.docker.internal:5001/flagsmith \ + -e FLAGSMITH_SERVER_KEY=dummykey \ + -e FLAGSMITH_SERVER_KEY_BUSINESS_FEATURES=dummykeybusinessfeatures \ appsmith/cloud-services:release cd cicontainerlocal docker run -d --name appsmith -p 80:80 -p 9001:9001 \ @@ -523,7 +526,7 @@ jobs: name: dockerlogs path: ~/dockerlogs - - name: Rename reports + - name: Rename reports if: always() run: | mkdir -p ~/results diff --git a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js index cec5a7010a..47b6f9531b 100644 --- a/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js +++ b/app/client/cypress/e2e/Regression/ClientSide/OtherUIFeatures/Replay_Editor_spec.js @@ -44,7 +44,7 @@ describe("Undo/Redo functionality", function () { }); cy.get(datasourceEditor.password).should("be.empty").wait(1000); cy.get(datasourceEditor.saveBtn).click({ force: true }); - dataSources.AssertDSActive(postgresDatasourceName); + dataSources.AssertDSInActiveList(postgresDatasourceName); }); }); diff --git a/app/client/cypress/support/Objects/DataManager.ts b/app/client/cypress/support/Objects/DataManager.ts index 8ed441f038..2893126a94 100644 --- a/app/client/cypress/support/Objects/DataManager.ts +++ b/app/client/cypress/support/Objects/DataManager.ts @@ -108,9 +108,9 @@ export class DataManager { postgres_host: "host.docker.internal", postgres_port: 5432, - postgres_databaseName: "fakeapitest", - postgres_username: "docker", - postgres_password: "docker", + postgres_databaseName: "stagingdb", + postgres_username: "dockerstaging", + postgres_password: "dockerstaging", mysql_host: "host.docker.internal", mysql_port: 3306, diff --git a/app/client/cypress/support/Pages/DataSources.ts b/app/client/cypress/support/Pages/DataSources.ts index f3224bd79a..ab3501aefb 100644 --- a/app/client/cypress/support/Pages/DataSources.ts +++ b/app/client/cypress/support/Pages/DataSources.ts @@ -945,7 +945,7 @@ export class DataSources { ? this._createQuery : this._datasourceCardGeneratePageBtn; - this.AssertDSActive(new RegExp("^" + datasourceName + "$")) //This regex is to exact match the datasource name + this.AssertDSInActiveList(new RegExp("^" + datasourceName + "$")) //This regex is to exact match the datasource name .scrollIntoView() .should("be.visible") .then(($element) => { @@ -962,7 +962,7 @@ export class DataSources { this.assertHelper.AssertNetworkStatus("@getDatasourceStructure", 200); //Making sure table dropdown is populated } - public AssertDSActive(dsName: string | RegExp) { + public AssertDSInActiveList(dsName: string | RegExp) { this.entityExplorer.NavigateToSwitcher("Explorer", 0, true); this.entityExplorer.ExpandCollapseEntity("Datasources", false); //this.entityExplorer.SelectEntityByName(datasourceName, "Datasources");