From 9b5ce68c5a9e2997ba801a8d1a74c8e02fb902ca Mon Sep 17 00:00:00 2001 From: d rowe <51932404+d-rowe@users.noreply.github.com> Date: Mon, 13 Jan 2025 14:47:47 -0800 Subject: [PATCH] chore: use relative paths in cypress (#9079) * chore: use relative paths in cypress when we move to running tests in parallel we won't be able to use a single hardcoded basepath as these can differ by tasks Signed-off-by: Daniel Rowe * Changeset file for PR #9079 created/updated --------- Signed-off-by: Daniel Rowe Co-authored-by: opensearch-changeset-bot[bot] <154024398+opensearch-changeset-bot[bot]@users.noreply.github.com> --- changelogs/fragments/9079.yml | 2 ++ cypress/utils/commands.js | 20 +++++++------------- 2 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 changelogs/fragments/9079.yml diff --git a/changelogs/fragments/9079.yml b/changelogs/fragments/9079.yml new file mode 100644 index 000000000000..bc70f1c9091d --- /dev/null +++ b/changelogs/fragments/9079.yml @@ -0,0 +1,2 @@ +chore: +- Use relative paths in cypress utilities ([#9079](https://github.com/opensearch-project/OpenSearch-Dashboards/pull/9079)) \ No newline at end of file diff --git a/cypress/utils/commands.js b/cypress/utils/commands.js index cb9e2882e3c2..cfe938140e7c 100644 --- a/cypress/utils/commands.js +++ b/cypress/utils/commands.js @@ -131,9 +131,7 @@ Cypress.Commands.add('bulkUploadDocs', (fixturePath, index) => { Cypress.Commands.add('importSavedObjects', (fixturePath, overwrite = true) => { const sendImportRequest = (ndjson) => { - const url = `${Cypress.config().baseUrl}/api/saved_objects/_import?${ - overwrite ? `overwrite=true` : '' - }`; + const url = `/api/saved_objects/_import?${overwrite ? `overwrite=true` : ''}`; const formData = new FormData(); formData.append('file', ndjson, 'savedObject.ndjson'); @@ -164,7 +162,7 @@ Cypress.Commands.add('importSavedObjects', (fixturePath, overwrite = true) => { }); Cypress.Commands.add('deleteSavedObject', (type, id, options = {}) => { - const url = `${Cypress.config().baseUrl}/api/saved_objects/${type}/${id}`; + const url = `/api/saved_objects/${type}/${id}`; return cy.request({ method: 'DELETE', @@ -187,9 +185,7 @@ Cypress.Commands.add('deleteSavedObjectByType', (type, search) => { searchParams.set('search', search); } - const url = `${ - Cypress.config().baseUrl - }/api/opensearch-dashboards/management/saved_objects/_find?${searchParams.toString()}`; + const url = `/api/opensearch-dashboards/management/saved_objects/_find?${searchParams.toString()}`; return cy.request(url).then((response) => { console.log('response', response); @@ -210,9 +206,7 @@ Cypress.Commands.add('ifDataSourceExists', (search) => { searchParams.set('search', search); } - const url = `${ - Cypress.config().baseUrl - }/api/opensearch-dashboards/management/saved_objects/_find?${searchParams.toString()}`; + const url = `/api/opensearch-dashboards/management/saved_objects/_find?${searchParams.toString()}`; return cy.request(url).then((response) => { console.log('response', response); @@ -221,7 +215,7 @@ Cypress.Commands.add('ifDataSourceExists', (search) => { }); Cypress.Commands.add('createIndexPattern', (id, attributes, header = {}) => { - const url = `${Cypress.config().baseUrl}/api/saved_objects/index-pattern/${id}`; + const url = `/api/saved_objects/index-pattern/${id}`; cy.request({ method: 'POST', @@ -239,7 +233,7 @@ Cypress.Commands.add('createIndexPattern', (id, attributes, header = {}) => { }); Cypress.Commands.add('createDashboard', (attributes = {}, headers = {}) => { - const url = `${Cypress.config().baseUrl}/api/saved_objects/dashboard`; + const url = '/api/saved_objects/dashboard'; cy.request({ method: 'POST', @@ -275,7 +269,7 @@ Cypress.Commands.add('deleteIndexPattern', (id, options = {}) => ); Cypress.Commands.add('setAdvancedSetting', (changes) => { - const url = `${Cypress.config().baseUrl}/api/opensearch-dashboards/settings`; + const url = '/api/opensearch-dashboards/settings'; cy.log('setAdvancedSetting') .request({ method: 'POST',