- changed re-routing code to not push the wrong route to history

- deleted useless isViteRunning getter
- fixed amalgamation statement validation (was undefined on draft
  restore)
- update misc comments

src/App.vue

@@ -667,8 +667,8 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
     // reset errors in case this method is invoked more than once (ie, retry)
     this.resetFlags()
 
-    // don't check FF during Vitest tests
-    if (!this.isVitestRunning) {
+    // only check FF when not in Vitest tests
+    if (import.meta.env.VITEST === undefined) {
       // check that current route matches a supported filing type
       const supportedFilings = await GetFeatureFlag('supported-filings')
       if (!supportedFilings?.includes(this.$route.meta.filingType)) {
@@ -753,31 +753,31 @@ export default class App extends Mixins(CommonMixin, DateMixin, FilingTemplateMi
         switch (this.getFilingType) {
           case FilingTypes.AMALGAMATION_APPLICATION:
             if (this.isAmalgamationFilingRegular) {
-              this.$router.push(RouteNames.AMALG_REG_INFORMATION).catch(() => {})
+              this.$router.replace(RouteNames.AMALG_REG_INFORMATION).catch(() => {})
             } else if (this.isAmalgamationFilingHorizontal || this.isAmalgamationFilingVertical) {
-              this.$router.push(RouteNames.AMALG_SHORT_INFORMATION).catch(() => {})
+              this.$router.replace(RouteNames.AMALG_SHORT_INFORMATION).catch(() => {})
             } else {
               throw new Error('invalid amalgamation filing type')
             }
             return
           case FilingTypes.CONTINUATION_IN:
-            this.$router.push(RouteNames.CONTINUATION_IN_BUSINESS_HOME).catch(() => {})
+            this.$router.replace(RouteNames.CONTINUATION_IN_BUSINESS_HOME).catch(() => {})
             return
           case FilingTypes.DISSOLUTION:
             if (this.isTypeFirm) {
-              this.$router.push(RouteNames.DISSOLUTION_FIRM).catch(() => {})
+              this.$router.replace(RouteNames.DISSOLUTION_FIRM).catch(() => {})
             } else {
-              this.$router.push(RouteNames.DISSOLUTION_DEFINE_DISSOLUTION).catch(() => {})
+              this.$router.replace(RouteNames.DISSOLUTION_DEFINE_DISSOLUTION).catch(() => {})
             }
             return
           case FilingTypes.INCORPORATION_APPLICATION:
-            this.$router.push(RouteNames.INCORPORATION_DEFINE_COMPANY).catch(() => {})
+            this.$router.replace(RouteNames.INCORPORATION_DEFINE_COMPANY).catch(() => {})
             return
           case FilingTypes.REGISTRATION:
-            this.$router.push(RouteNames.REGISTRATION_DEFINE_BUSINESS).catch(() => {})
+            this.$router.replace(RouteNames.REGISTRATION_DEFINE_BUSINESS).catch(() => {})
             return
           case FilingTypes.RESTORATION:
-            this.$router.push(RouteNames.RESTORATION_BUSINESS_NAME).catch(() => {})
+            this.$router.replace(RouteNames.RESTORATION_BUSINESS_NAME).catch(() => {})
             return
           default:
             this.invalidRouteDialog = true

src/components/common/Actions.vue

@@ -303,7 +303,7 @@ export default class Actions extends Mixins(AmalgamationMixin, CommonMixin,
         this.setIsFilingPaying(false)
       }
     } else {
-      // don't call window.scrollTo during Vitest tests because jsdom doesn't implement it
+      // otherwise, smooth-scroll to the top of the page
       window.scrollTo({ top: 0, behavior: 'smooth' })
     }
   }

src/components/common/SummaryDefineCompany.vue

@@ -236,7 +236,6 @@ export default class SummaryDefineCompany extends Vue {
   /** Whether this section is invalid. */
   get invalidSection (): boolean {
     if (this.isAmalgamationFiling) {
-      // *** FUTURE: update this for short-form amalgamation (needs to be valid)
       return (!this.isAmalgamationInformationValid || !this.isDefineCompanyValid)
     }
     return !this.isDefineCompanyValid

src/main.ts

@@ -78,7 +78,7 @@ async function start () {
   await KeycloakService.setKeycloakConfigUrl(keycloakConfig)
 
   // initialize token service which will do a check-sso to initiate session
-  // don't start during Vitest tests as it messes up the test JWT
+  // only do when not in Vitest tests as it messes up the test JWT
   if (import.meta.env.VITEST === undefined) {
     console.info('Starting token refresh service...') // eslint-disable-line no-console
     await KeycloakService.initializeToken()

src/mixins/common-mixin.ts

@@ -9,11 +9,6 @@ import { getName } from 'country-list'
  */
 @Component({})
 export default class CommonMixin extends Vue {
-  /** Is True if Vitest is running the code. */
-  get isVitestRunning (): boolean {
-    return (import.meta.env.VITEST !== undefined)
-  }
-
   /**
    * Compares two objects while omitting specified properties from the comparison.
    * @param objA the first object to compare

src/mixins/filing-template-mixin.ts

@@ -300,7 +300,10 @@ export default class FilingTemplateMixin extends Mixins(AmalgamationMixin, DateM
     }
 
     // restore the Amalgamation Court Approval if it's True or False
-    if (draftFiling.amalgamationApplication.courtApproval !== null) {
+    if (
+      draftFiling.amalgamationApplication.courtApproval === true ||
+      draftFiling.amalgamationApplication.courtApproval === false
+    ) {
       this.setAmalgamationCourtApproval(draftFiling.amalgamationApplication.courtApproval)
     }
 

src/store/store.ts

@@ -600,11 +600,11 @@ export const useStore = defineStore('store', {
           this.getNameTranslationsValid
         )
       } else {
-        // NB - this is the only valid Correct Name Option for short-form amalgamations
-        // NB - there are no name translations for short-form amalgamations
         return (
           this.getAmalgamatingBusinessesValid &&
+          // NB - this is the only valid Correct Name Option for short-form amalgamations:
           this.getCorrectNameOption === CorrectNameOptions.CORRECT_AML_ADOPT
+          // NB - there are no name translations for short-form amalgamations
         )
       }
     },

src/views/Amalgamation/ReviewConfirm.vue

@@ -362,12 +362,12 @@ export default class AmalgamationReviewConfirm extends Vue {
 
   /** Is true when the Folio Number is not valid */
   get isFolioInvalid (): boolean {
-    return this.getValidateSteps && !(this.getFolioNumberValid)
+    return (this.getValidateSteps && !this.getFolioNumberValid)
   }
 
   /** Is true when the amalgamation statement is not valid */
   get isAmalgamationStatementInvalid (): boolean {
-    return this.getValidateSteps && !(this.getAmalgamationCourtApprovalValid)
+    return (this.getValidateSteps && !this.getAmalgamationCourtApprovalValid)
   }
 }
 </script>

tests/unit/AmalgamationInformation.spec.ts

@@ -25,7 +25,7 @@ const amalgamationRegularBusinessInfo = [
 ]
 
 for (const test of amalgamationRegularBusinessInfo) {
-  describe(`Amalgamation Regular Business Information for a ${test.entityType}`, () => {
+  describe(`Amalgamation-Regular Information for a ${test.entityType}`, () => {
     let wrapper: any
 
     beforeAll(() => {

tests/unit/AmalgamationPeopleRoles.spec.ts

@@ -20,7 +20,7 @@ const amalgamationRegularBusinessInfo = [
 ]
 
 for (const test of amalgamationRegularBusinessInfo) {
-  describe(`Amalgamation Regular Business Information for a ${test.entityType}`, () => {
+  describe(`Amalgamation-Regular People and Roles for a ${test.entityType}`, () => {
     let wrapper: any
 
     beforeAll(() => {
@@ -52,7 +52,7 @@ for (const test of amalgamationRegularBusinessInfo) {
 
   // *** TODO: finish the tests for short-form amalgamations
   // especially differences between regular and short-form
-  describe(`Amalgamation Regular Business Information for a ${test.entityType}`, () => {
+  describe(`Amalgamation-Regular People and Roles for a ${test.entityType}`, () => {
     let wrapper: any
 
     beforeAll(() => {

tests/unit/AmalgamationReviewConfirm.spec.ts

@@ -29,7 +29,7 @@ const amalgamationRegularBusinessInfo = [
 ]
 
 for (const test of amalgamationRegularBusinessInfo) {
-  describe(`Restoration Review Confirm for a ${test.entityType}`, () => {
+  describe(`Amalgamation-Regular Review Confirm for a ${test.entityType}`, () => {
     let wrapper: any
 
     beforeAll(() => {

tests/unit/AmalgamationShareStructure.spec.ts

@@ -21,7 +21,7 @@ const amalgamationRegularBusinessInfo = [
 ]
 
 for (const test of amalgamationRegularBusinessInfo) {
-  describe(`Amalgamation Regular Business Information for a ${test.entityType}`, () => {
+  describe(`Amalgamation-Regular Share Structure for a ${test.entityType}`, () => {
     let wrapper: any
 
     beforeAll(() => {