From ece56fcc7771d4a27d1fc32aad16c898844ff9fc Mon Sep 17 00:00:00 2001 From: Adrian Smijulj Date: Fri, 15 Jan 2021 11:49:44 +0100 Subject: [PATCH] chore: update variable names --- .../admin/pageBuilder/menus/pagesListMenuItemType.spec.js | 6 +++--- .../integration-old/admin/settings/siteRefresh.spec.js | 4 ++-- .../adminInstallation/installation.spec.js | 4 ++-- example.cypress.json | 8 ++++---- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cypress/integration-old/admin/pageBuilder/menus/pagesListMenuItemType.spec.js b/cypress/integration-old/admin/pageBuilder/menus/pagesListMenuItemType.spec.js index d4d6da3ff51..9ae1254ae5a 100644 --- a/cypress/integration-old/admin/pageBuilder/menus/pagesListMenuItemType.spec.js +++ b/cypress/integration-old/admin/pageBuilder/menus/pagesListMenuItemType.spec.js @@ -54,7 +54,7 @@ context("Menus Module", () => { .findByText("Save menu") .click() .findByText("Record saved successfully.") - .visit(Cypress.env("SITE_URL")) + .visit(Cypress.env("WEBSITE_URL")) .reloadUntil(() => { // We wait until the document contains the newly added menu. return Cypress.$(`:contains(${id})`).length; @@ -97,7 +97,7 @@ context("Menus Module", () => { .findByText("Save menu") .click() .findByText("Record saved successfully.") - .visit(Cypress.env("SITE_URL")) + .visit(Cypress.env("WEBSITE_URL")) .reloadUntil(() => { // We wait until the document contains the newly added menu. return Cypress.$(`:contains(${idEdited})`).length; @@ -129,7 +129,7 @@ context("Menus Module", () => { cy.findByText("Save menu") .click() .findByText("Record saved successfully.") - .visit(Cypress.env("SITE_URL")) + .visit(Cypress.env("WEBSITE_URL")) .reloadUntil(() => { // We wait until the document contains the newly added menu. return Cypress.$(`:contains(${idEdited})`).length === 0; diff --git a/cypress/integration-old/admin/settings/siteRefresh.spec.js b/cypress/integration-old/admin/settings/siteRefresh.spec.js index 953294dd36a..65febf28eca 100644 --- a/cypress/integration-old/admin/settings/siteRefresh.spec.js +++ b/cypress/integration-old/admin/settings/siteRefresh.spec.js @@ -14,7 +14,7 @@ context("Page Builder Settings", () => { .click() .findByText("Settings updated successfully."); - cy.visit(Cypress.env("SITE_URL")) + cy.visit(Cypress.env("WEBSITE_URL")) .reloadUntil(() => { // We wait until the document contains the newly added menu. return Cypress.$(`:contains(New-site-name-${id})`).length; @@ -42,7 +42,7 @@ context("Page Builder Settings", () => { .click() .findByText("Settings updated successfully."); - cy.visit(Cypress.env("SITE_URL")) + cy.visit(Cypress.env("WEBSITE_URL")) .reloadUntil(() => { // We wait until the document contains the newly added menu. return Cypress.$(`a[href="${facebook}"]`).length; diff --git a/cypress/integration-old/adminInstallation/installation.spec.js b/cypress/integration-old/adminInstallation/installation.spec.js index 8c2168863ed..d83f7dac020 100644 --- a/cypress/integration-old/adminInstallation/installation.spec.js +++ b/cypress/integration-old/adminInstallation/installation.spec.js @@ -11,7 +11,7 @@ context("Admin Installation", () => { it("should be able to complete the initial installation wizard", () => { // 1. Security installation. - cy.visit(Cypress.env("SITE_URL")) + cy.visit(Cypress.env("WEBSITE_URL")) .wait(2000) .findByText("Admin UI") .click() @@ -63,7 +63,7 @@ context("Admin Installation", () => { cy.findByText("Value is required.").should("exist"); cy.findByLabelText("Site Name") - .type(Cypress.env("SITE_NAME")) + .type(Cypress.env("WEBSITE_NAME")) .findByTestId("install-pb-button") .click() .wait(25000); // Wait for the Page Builder installation to finish. diff --git a/example.cypress.json b/example.cypress.json index f76a0b1f623..3435fcde3f7 100644 --- a/example.cypress.json +++ b/example.cypress.json @@ -1,7 +1,7 @@ { "viewportWidth": 1600, "viewportHeight": 1200, - "baseUrl": "https://SITE_CDN_ID.cloudfront.net", + "baseUrl": "https://WEBSITE_CDN_ID.cloudfront.net", "defaultCommandTimeout": 30000, "video": false, "retries": { @@ -9,9 +9,9 @@ "openMode": 0 }, "env": { - "SITE_NAME": "Cypress Test Site", - "SITE_URL": "https://SITE_CDN_ID.cloudfront.net", - "ADMIN_URL": "https://SITE_CDN_ID.cloudfront.net/admin", + "WEBSITE_NAME": "Cypress Test Website", + "WEBSITE_URL": "https://WEBSITE_CDN_ID.cloudfront.net", + "ADMIN_URL": "https://WEBSITE_CDN_ID.cloudfront.net/admin", "API_URL": "https://API_CDN_ID.cloudfront.net", "GRAPHQL_API_URL": "https://API_CDN_ID.cloudfront.net/graphql", "AUTHORIZATION_TOKEN_KEY": "webiny-token",