Fix e2e tests (#3508)

airbytehq · May 21, 2021 · 5e0a914 · 5e0a914
1 parent 9e3bfee
commit 5e0a914
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 21 deletions.
diff --git a/airbyte-e2e-testing/cypress/integration/source.spec.js b/airbyte-e2e-testing/cypress/integration/source.spec.js
@@ -5,7 +5,8 @@ describe("Source main actions", () => {
     cy.url().should("include", `${Cypress.config().baseUrl}/source/`);
   });
 
-  it("Update source", () => {
+  //TODO: add update source on some other connector or create 1 more user for pg
+  it.skip("Update source", () => {
     cy.createTestSource("Test source cypress for update");
     cy.updateSource("Test source cypress for update", "connectionConfiguration.start_date", "2020-11-11");
 

diff --git a/airbyte-e2e-testing/cypress/support/commands/common.js b/airbyte-e2e-testing/cypress/support/commands/common.js
@@ -6,19 +6,6 @@ Cypress.Commands.add("fillEmail", (email) => {
   cy.get("input[name=email]").type(email);
 })
 
-Cypress.Commands.add("fillTestExchangeForm", (name) => {
-  cy.intercept("/source_definition_specifications/get").as("getSourceSpecifications");
-
-  cy.get("input[name=name]").type(name);
-  cy.get("div[role=combobox]").click();
-  cy.get("div").contains("Exchange Rates Api").click();
-
-  cy.wait("@getSourceSpecifications");
-
-  cy.get("input[name='connectionConfiguration.base']").type("USD");
-  cy.get("input[name='connectionConfiguration.start_date']").type("2020-12-12");
-})
-
 Cypress.Commands.add("fillTestLocalJsonForm", (name) => {
   cy.intercept("/destination_definition_specifications/get").as("getDestinationSpecifications");
 

diff --git a/airbyte-e2e-testing/cypress/support/commands/source.js b/airbyte-e2e-testing/cypress/support/commands/source.js
@@ -1,17 +1,41 @@
+Cypress.Commands.add("fillPgSourceForm", (name) => {
+  cy.intercept("/source_definition_specifications/get").as(
+    "getSourceSpecifications"
+  );
+
+  cy.get("input[name=name]").type(name);
+  cy.get("div[role=combobox]").click();
+  cy.get("div").contains("Postgres").click();
+
+  cy.wait("@getSourceSpecifications");
+
+  cy.get("input[name='connectionConfiguration.host']").type("localhost");
+  cy.get("input[name='connectionConfiguration.port']").type("{selectAll}{del}5433");
+  cy.get("input[name='connectionConfiguration.database']").type("airbyte_ci");
+  cy.get("input[name='connectionConfiguration.username']").type("postgres");
+  cy.get("input[name='connectionConfiguration.password']").type(
+    "secret_password"
+  );
+});
+
 Cypress.Commands.add("createTestSource", (name) => {
-  cy.intercept("/scheduler/sources/check_connection").as("checkSourceUpdateConnection");
+  cy.intercept("/scheduler/sources/check_connection").as(
+    "checkSourceUpdateConnection"
+  );
   cy.intercept("/sources/create").as("createSource");
 
   cy.openNewSourceForm();
-  cy.fillTestExchangeForm(name);
+  cy.fillPgSourceForm(name);
   cy.submit();
 
   cy.wait("@checkSourceUpdateConnection");
   cy.wait("@createSource");
-})
+});
 
 Cypress.Commands.add("updateSource", (name, field, value) => {
-  cy.intercept("/sources/check_connection_for_update").as("checkSourceConnection");
+  cy.intercept("/sources/check_connection_for_update").as(
+    "checkSourceConnection"
+  );
   cy.intercept("/sources/update").as("updateSource");
 
   cy.openSourcePage();
@@ -21,10 +45,10 @@ Cypress.Commands.add("updateSource", (name, field, value) => {
 
   cy.wait("@checkSourceConnection");
   cy.wait("@updateSource");
-})
+});
 
 Cypress.Commands.add("deleteSource", (name) => {
   cy.openSourcePage();
   cy.openSettingForm(name);
   cy.deleteEntity();
-})
+});
diff --git a/tools/bin/e2e_test.sh b/tools/bin/e2e_test.sh
@@ -16,10 +16,12 @@ mkdir -p /tmp/airbyte_local
 
 # Detach so we can run subsequent commands
 VERSION=dev TRACKING_STRATEGY=logging docker-compose up -d
-trap "echo 'docker-compose logs:' && docker-compose logs -t --tail 150 && docker-compose down" EXIT
+trap 'echo "docker-compose logs:" && docker-compose logs -t --tail 150 && docker-compose down && docker rm -f $(docker ps -q --filter name=airbyte_ci_pg)' EXIT
 
+docker run -d -p 5433:5432 -e POSTGRES_PASSWORD=secret_password -e POSTGRES_DB=airbyte_ci --name airbyte_ci_pg postgres
 echo "Waiting for services to begin"
 sleep 30 # TODO need a better way to wait
 
 echo "Running e2e tests via gradle"
 ./gradlew --no-daemon :airbyte-e2e-testing:e2etest
+