Change tests to use a single finish page

Author: abelsiqueira

cypress/e2e/errors.cy.ts

@@ -15,7 +15,7 @@ describe('On application start', () => {
     // Since the stepper is separate from the screen itself, it doesn't matter which screen we join
     const stepsWithExpectedErrors = ['start', 'authors']
     it('should have errors in start and authors, but not in any other steps', () => {
-        cy.visit('/finish-advanced')
+        cy.visit('/identifiers')
         stepsWithExpectedErrors.forEach((step) => {
             cy.checkThatStepperValidityIs(false, step)
         })
@@ -43,10 +43,9 @@ describe('From a fixed advanced app', () => {
         cy.visit('/authors')
         cy.dataCy('btn-add-author')
             .click()
-        cy.visit('/finish-advanced')
+        cy.visit('/identifiers')
     })
     it('should have no errors', () => {
-        cy.visit('/finish-advanced')
         allStepNames.forEach((step) => {
             cy.checkThatStepperValidityIs(true, step)
             cy.dataCy('ta-cff-preview')

cypress/e2e/navigation.cy.ts

@@ -29,7 +29,7 @@ describe('App navigation', () => {
                 cy.dataCy('btn-previous')
                     .should('be.visible')
             })
-            cy.url().should('include', '/finish-minimum')
+            cy.url().should('include', '/finish')
             cy.dataCy('btn-next')
                 .should('not.be.visible')
             Array.from(basicStepNames).reverse().forEach((step) => {
@@ -44,7 +44,7 @@ describe('App navigation', () => {
                 .should('not.be.visible')
         })
         it('should be navigable through the stepper', () => {
-            ['finish-minimum', ...basicStepNames, ...[...basicStepNames].reverse()].forEach((step) => {
+            ['finish', ...basicStepNames, ...[...basicStepNames].reverse()].forEach((step) => {
                 cy.visit(step === 'start' ? '/authors' : `/${step}`)
                 cy.dataCy(`step-${step}`)
                     .click()
@@ -62,7 +62,7 @@ describe('App navigation', () => {
             cy.visit('/authors')
             cy.dataCy('btn-add-author')
                 .click()
-            cy.visit('/finish-minimum')
+            cy.visit('/finish')
             cy.dataCy('btn-add-more')
                 .click()
         })
@@ -82,7 +82,7 @@ describe('App navigation', () => {
                 cy.dataCy('btn-previous')
                     .should('be.visible')
             })
-            cy.url().should('include', '/finish-advanced')
+            cy.url().should('include', '/finish')
             cy.dataCy('btn-next')
                 .should('not.be.visible')
             Array.from(allStepNames).reverse().forEach((step) => {
@@ -97,7 +97,7 @@ describe('App navigation', () => {
                 .should('not.be.visible')
         })
         it('should be navigable through the stepper', () => {
-            ['finish-advanced', ...allStepNames, ...[...allStepNames].reverse()].forEach((step) => {
+            ['finish', ...allStepNames, ...[...allStepNames].reverse()].forEach((step) => {
                 cy.visit(step === 'start' ? '/authors' : `/${step}`)
                 cy.dataCy(`step-${step}`)
                     .click()
@@ -106,7 +106,7 @@ describe('App navigation', () => {
             })
         })
         describe('if there are no errors', () => {
-            it('should jump from step to finish-advanced when finish is clicked', () => {
+            it('should jump from step to finish when finish is clicked', () => {
                 allStepNames.forEach((step) => {
                     cy.visit(`/${step}`)
                     // The next test is just to make sure the page loaded without using cy.wait
@@ -115,7 +115,7 @@ describe('App navigation', () => {
                         .should('be.visible')
                         .click()
                     cy.url()
-                        .should('contain', '/finish-advanced')
+                        .should('contain', '/finish')
                 })
             })
         })
@@ -153,8 +153,8 @@ describe('App navigation', () => {
                 }
             })
         })
-        it(`should have ${basicStepNames.length + 1} steps, visible previous, hidden next/finish for step finish-minimum`, () => {
-            cy.visit('/finish-minimum')
+        it(`should have ${basicStepNames.length + 1} steps, visible previous, hidden next/finish for step finish`, () => {
+            cy.visit('/finish')
             cy.get('.q-stepper__tab')
                 .should('have.length', basicStepNames.length + 1)
             cy.dataCy('btn-finish')
@@ -164,17 +164,6 @@ describe('App navigation', () => {
             cy.dataCy('btn-previous')
                 .should('be.visible')
         })
-        it(`should have ${advancedStepNames.length + 1} steps, visible previous, hidden next/finish for step finish-advanced`, () => {
-            cy.visit('/finish-advanced')
-            cy.get('.q-stepper__tab')
-                .should('have.length', allStepNames.length + 1)
-            cy.dataCy('btn-finish')
-                .should('not.be.visible')
-            cy.dataCy('btn-next')
-                .should('not.be.visible')
-            cy.dataCy('btn-previous')
-                .should('be.visible')
-        })
     })
 
     describe('On the screen Authors', () => {

cypress/e2e/spec.cy.ts

@@ -75,7 +75,7 @@ describe('Basic usage', () => {
             .click()
 
         // Finish Minimum screen
-        cy.url().should('include', '/finish-minimum')
+        cy.url().should('include', '/finish')
         cy.dataCy('btn-download')
             .click()
         const downloadsFolder = Cypress.config('downloadsFolder')
@@ -131,7 +131,7 @@ describe('Basic usage', () => {
             .click()
 
         // Finish Minimum screen
-        cy.url().should('include', '/finish-minimum')
+        cy.url().should('include', '/finish')
         cy.dataCy('btn-add-more')
             .click()
 
@@ -241,7 +241,7 @@ describe('Basic usage', () => {
             .click()
 
         // Finish Advanced screen
-        cy.url().should('include', '/finish-advanced')
+        cy.url().should('include', '/finish')
         cy.dataCy('btn-download')
             .click()
 

test/jest/__tests__/store/app.jest.spec.ts

@@ -60,7 +60,7 @@ describe('useApp', () => {
                 void navigateNext()
                 expect(cannotGoBack.value).toBe(false)
             })
-            expect(stepName.value).toBe('finish-minimum')
+            expect(stepName.value).toBe('finish')
             expect(cannotGoForward.value).toBe(true)
             Array.from(basicStepNames).reverse().forEach((step) => {
                 expect(cannotGoBack.value).toBe(false)
@@ -79,7 +79,7 @@ describe('useApp', () => {
         })
         const allSteps = [...basicStepNames, ...advancedStepNames]
         it(`should have ${allSteps.length} as lastIndex`, () => {
-            expect(lastStepIndex.value).toBe(allSteps.length + 1) // Off-by-one numbering of steps
+            expect(lastStepIndex.value).toBe(allSteps.length)
         })
         it('should be navigable with next and previous (except at boundaries)', () => {
             expect(cannotGoBack.value).toBe(true)
@@ -89,7 +89,7 @@ describe('useApp', () => {
                 void navigateNext()
                 expect(cannotGoBack.value).toBe(false)
             })
-            expect(stepName.value).toBe('finish-advanced')
+            expect(stepName.value).toBe('finish')
             expect(cannotGoForward.value).toBe(true)
             Array.from(allSteps).reverse().forEach((step) => {
                 expect(cannotGoBack.value).toBe(false)
@@ -115,21 +115,14 @@ describe('useApp', () => {
                 expect(cannotGoBack.value).toBe(false)
             })
         })
-        it('should enable advanced mode for step finish-advanced and respect next/previous', () => {
-            expect(showAdvanced.value).toBe(false)
-            navigateDirect('finish-advanced')
-            expect(showAdvanced.value).toBe(true)
-            expect(cannotGoForward.value).toBe(true)
-            expect(cannotGoBack.value).toBe(false)
-        })
-        it('should not enable advanced mode for basic steps and finish-minimum and respect next/previous', () => {
+        it('should not enable advanced mode for basic steps and finish and respect next/previous', () => {
             basicStepNames.forEach((step) => {
                 navigateDirect(step)
                 expect(showAdvanced.value).toBe(false)
                 expect(cannotGoForward.value).toBe(false)
                 expect(cannotGoBack.value).toBe(step === 'start')
             })
-            navigateDirect('finish-minimum')
+            navigateDirect('finish')
             expect(showAdvanced.value).toBe(false)
             expect(cannotGoForward.value).toBe(true)
             expect(cannotGoBack.value).toBe(false)