fix: errors after merge conflicts

Author: ChengShi-1

tests/component/sections/layout/header/Header.spec.tsx

@@ -22,8 +22,9 @@ describe('Header component', () => {
       </WithRepositories>
     )
 
-    cy.findByRole('link', { name: /Dataverse/ }).should('exist')
-    cy.findByRole('link').should('have.attr', 'href', '/modern/')
+    cy.findByRole('link', { name: /Dataverse/ })
+      .should('exist')
+      .and('have.attr', 'href')
   })
 
   it('displays the user name when the user is logged in', () => {

tests/e2e-integration/e2e/sections/dataset/Dataset.spec.tsx

@@ -335,7 +335,9 @@ describe('Dataset', () => {
             return { dataset, guestbook }
           })
         ).then(({ dataset, guestbook }) => {
-          cy.visit(`/spa/datasets?persistentId=${dataset.persistentId}&version=${DRAFT_PARAM}`)
+          cy.visit(
+            `${FRONTEND_BASE_PATH}/datasets?persistentId=${dataset.persistentId}&version=${DRAFT_PARAM}`
+          )
 
           cy.findByRole('tab', { name: /Terms and Guestbook/ }).click()
           cy.findByTestId('dataset-terms-guestbook-accordion-header')
@@ -794,7 +796,7 @@ describe('Dataset', () => {
         .then((persistentId: string) => {
           TestsUtils.logout()
           cy.wait(1500) // Wait for the dataset to be published and the session to clear
-          cy.visit(`/spa/datasets?persistentId=${persistentId}`)
+          cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${persistentId}`)
           cy.wait(1500) // Wait for the page to load
 
           cy.findByText('Files').should('exist')
@@ -824,7 +826,7 @@ describe('Dataset', () => {
             return dataset
           })
         ).then((publishedDataset) => {
-          cy.visit(`/spa/datasets?persistentId=${publishedDataset.persistentId}`)
+          cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${publishedDataset.persistentId}`)
           cy.wait(1500) // Wait for the page to load
 
           cy.findByText('Files').should('exist')
@@ -856,7 +858,7 @@ describe('Dataset', () => {
           })
         ).then((publishedDataset) => {
           TestsUtils.logout()
-          cy.visit(`/spa/datasets?persistentId=${publishedDataset.persistentId}`)
+          cy.visit(`${FRONTEND_BASE_PATH}/datasets?persistentId=${publishedDataset.persistentId}`)
           cy.wait(1500)
 
           cy.findByText('Files').should('exist')

tests/e2e-integration/e2e/sections/edit-dataset-terms/EditDatasetTerms.spec.tsx

@@ -231,7 +231,9 @@ describe('Edit Dataset Terms', () => {
           const searchParams = new URLSearchParams()
           searchParams.set(QueryParamKey.PERSISTENT_ID, dataset.persistentId)
           searchParams.set(QueryParamKey.VERSION, DatasetNonNumericVersionSearchParam.DRAFT)
-          const editDatasetTermsUrl = `/spa${Route.EDIT_DATASET_TERMS}?${searchParams.toString()}`
+          const editDatasetTermsUrl = `${FRONTEND_BASE_PATH}${
+            Route.EDIT_DATASET_TERMS
+          }?${searchParams.toString()}`
 
           cy.visit(editDatasetTermsUrl)