Merge pull request #1003 from CruGlobal/update-jest

[no-jira] Update Jest to v29
CruGlobal · Feb 13, 2023 · 641a329 · 641a329
2 parents f4ee531 + f15df60
commit 641a329
Show file tree

Hide file tree

Showing 11 changed files with 1,708 additions and 1,319 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 16.10.0
 
       - name: Install Dependencies
         run: yarn install --immutable --immutable-cache
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 16.10.0
 
       - name: Install Dependencies
         run: yarn install --immutable --immutable-cache
@@ -58,7 +58,7 @@ jobs:
 
       - uses: actions/setup-node@v2
         with:
-          node-version: 12
+          node-version: 16.10.0
 
       - name: Install Dependencies
         run: yarn install --immutable --immutable-cache

diff --git a/.tool-versions b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 16.0.0
+nodejs 16.10.0
 yarn 1.22.17
diff --git a/jest.config.js b/jest.config.js
@@ -6,6 +6,7 @@ module.exports = {
   ],
   restoreMocks: true,
   setupFilesAfterEnv: [
+    '<rootDir>/jest/setupAngularMocks.js',
     'angular',
     'angular-mocks',
     'jest-date-mock',
@@ -17,6 +18,7 @@ module.exports = {
   modulePaths: [
     '<rootDir>/src'
   ],
+  testEnvironment: 'jsdom',
   transform: {
     '^.+\\.js?$': 'babel-jest',
     '^.+\\.html$': '<rootDir>/jest/htmlTransform.js'

diff --git a/jest/htmlTransform.js b/jest/htmlTransform.js
@@ -7,6 +7,6 @@ module.exports = {
       resource: path.basename(filename)
     }
     const result = ngTemplateLoader.call(webpackContext, `\`${src}\``)
-    return `${result}; module.exports = "${path.basename(filename)}"`
+    return { code: `${result}; module.exports = "${path.basename(filename)}"` }
   }
 }
diff --git a/jest/setupAngularMocks.js b/jest/setupAngularMocks.js
@@ -0,0 +1,2 @@
+// angular-mocks won't setup mocking unless Jasmine or Karma is defined, so pretend like it is
+window.jasmine = true
diff --git a/package.json b/package.json
@@ -53,8 +53,9 @@
     "copy-webpack-plugin": "^5.0.4",
     "css-loader": "^3.2.0",
     "html-loader": "^0.5.5",
-    "jest": "^24.9.0",
+    "jest": "^29.4.2",
     "jest-date-mock": "^1.0.7",
+    "jest-environment-jsdom": "^29.4.2",
     "mini-css-extract-plugin": "^0.8.0",
     "moment-locales-webpack-plugin": "^1.1.0",
     "ngtemplate-loader": "^2.0.1",

diff --git a/src/app/designationEditor/designationEditor.spec.js b/src/app/designationEditor/designationEditor.spec.js
@@ -326,7 +326,7 @@ describe('Designation Editor', function () {
       let modalPromise
       beforeEach(inject((_$q_) => {
         modalPromise = _$q_.defer()
-        spyOn($ctrl.$uibModal, 'open').and.returnValue({ result: modalPromise.promise })
+        jest.spyOn($ctrl.$uibModal, 'open').mockReturnValue({ result: modalPromise.promise })
         $ctrl.designationContent = designationSecurityResponse
       }))
 
@@ -343,11 +343,11 @@ describe('Designation Editor', function () {
         ]
 
         expect($ctrl.$uibModal.open).toHaveBeenCalled()
-        expect($ctrl.$uibModal.open.calls.argsFor(0)[0].resolve.designationNumber()).toEqual(designationSecurityResponse.designationNumber)
-        expect($ctrl.$uibModal.open.calls.argsFor(0)[0].resolve.campaignPage()).toBeUndefined()
-        expect($ctrl.$uibModal.open.calls.argsFor(0)[0].resolve.photos()).toEqual(photos)
-        expect($ctrl.$uibModal.open.calls.argsFor(0)[0].resolve.photoLocation()).toEqual('secondaryPhotos')
-        expect($ctrl.$uibModal.open.calls.argsFor(0)[0].resolve.selectedPhoto()).toEqual(selectedPhotos)
+        expect($ctrl.$uibModal.open.mock.calls[0][0].resolve.designationNumber()).toEqual(designationSecurityResponse.designationNumber)
+        expect($ctrl.$uibModal.open.mock.calls[0][0].resolve.campaignPage()).toBeUndefined()
+        expect($ctrl.$uibModal.open.mock.calls[0][0].resolve.photos()).toEqual(photos)
+        expect($ctrl.$uibModal.open.mock.calls[0][0].resolve.photoLocation()).toEqual('secondaryPhotos')
+        expect($ctrl.$uibModal.open.mock.calls[0][0].resolve.selectedPhoto()).toEqual(selectedPhotos)
       })
 
       it('should have empty selectedPhotos', () => {

diff --git a/src/app/designationEditor/photoModal/photoModal.spec.js b/src/app/designationEditor/photoModal/photoModal.spec.js
@@ -35,7 +35,7 @@ describe('Designation Editor Photo', function () {
 
   it('uploadComplete', function () {
     let getPhotosPromise = $q.defer()
-    spyOn($ctrl.designationEditorService, 'getPhotos').and.returnValue(getPhotosPromise.promise)
+    jest.spyOn($ctrl.designationEditorService, 'getPhotos').mockReturnValue(getPhotosPromise.promise)
 
     $ctrl.uploadComplete()
     $timeout.flush()

diff --git a/src/app/profile/profile.component.spec.js b/src/app/profile/profile.component.spec.js
@@ -205,35 +205,37 @@ describe('ProfileComponent', function () {
   })
 
   describe('initTitles()', () => {
+    let expectedTitles;
     beforeEach(() => {
       $ctrl.donorDetails = {
         name: {},
         'spouse-name': {}
       }
-      this.expectedTitles = angular.copy(titles)
-      this.expectedTitles[''] = ''
+      expectedTitles = angular.copy(titles)
+      expectedTitles[''] = ''
     })
 
     it('should load all the normal titles', () => {
       $ctrl.initTitles()
 
-      expect($ctrl.availableTitles).toEqual(this.expectedTitles)
+      expect($ctrl.availableTitles).toEqual(expectedTitles)
     })
 
     it('should additional leacy titles if they are in use in donorDetails', () => {
       $ctrl.donorDetails.name.title = 'Alderman'
       $ctrl.donorDetails['spouse-name'].title = 'Prof'
       $ctrl.initTitles()
-      this.expectedTitles.Alderman = 'Alderman'
-      this.expectedTitles.Prof = 'Professor'
+      expectedTitles.Alderman = 'Alderman'
+      expectedTitles.Prof = 'Professor'
 
-      expect($ctrl.availableTitles).toEqual(this.expectedTitles)
+      expect($ctrl.availableTitles).toEqual(expectedTitles)
     })
   })
 
   describe('updateDonorDetails()', () => {
+    let donorDetails;
     beforeEach(() => {
-      this.donorDetails = {
+      donorDetails = {
         name: {
           'family-name': 'Lname',
           'given-name': 'Fname'
@@ -246,18 +248,18 @@ describe('ProfileComponent', function () {
     })
 
     it('should update donor details', () => {
-      $ctrl.donorDetails = this.donorDetails
+      $ctrl.donorDetails = donorDetails
       jest.spyOn($ctrl.profileService, 'updateProfileDonorDetails').mockReturnValue(Observable.of(''))
       jest.spyOn($ctrl, 'updateEmail').mockImplementation(() => {})
       $ctrl.updateDonorDetails()
 
-      expect($ctrl.profileService.updateProfileDonorDetails).toHaveBeenCalledWith(this.donorDetails)
+      expect($ctrl.profileService.updateProfileDonorDetails).toHaveBeenCalledWith(donorDetails)
       expect($ctrl.donorDetailsForm.$setPristine).toHaveBeenCalled()
       expect($ctrl.updateEmail).toHaveBeenCalled()
     })
 
     it('should update donor details while adding a spouse', () => {
-      $ctrl.donorDetails = this.donorDetails
+      $ctrl.donorDetails = donorDetails
       $ctrl.addingSpouse = true
       jest.spyOn($ctrl.profileService, 'updateProfileDonorDetails').mockReturnValue(Observable.of(''))
       jest.spyOn($ctrl, 'updateEmail').mockImplementation(() => {})

diff --git a/src/common/services/hateoasHelper.spec.js b/src/common/services/hateoasHelper.spec.js
@@ -149,8 +149,9 @@ describe('HATEOAS helper service', function () {
   })
 
   describe('mapChildZoomElements', () => {
+    let element, zoomString, childZoomStrings;
     beforeEach(() => {
-      this.element = {
+      element = {
         _code: [
           {
             someKey: 'someValue'
@@ -171,12 +172,12 @@ describe('HATEOAS helper service', function () {
           }
         ]
       }
-      this.zoomString = 'lineitems:element'
-      this.childZoomStrings = ['lineitems:element:code', 'lineitems:element:rates[]', 'lineitems:element:paymentmeans:creditcard']
+      zoomString = 'lineitems:element'
+      childZoomStrings = ['lineitems:element:code', 'lineitems:element:rates[]', 'lineitems:element:paymentmeans:creditcard']
     })
 
     it('should take an element and map the child zoom strings to keys', () => {
-      expect(self.hateoasHelperService.mapChildZoomElements(this.element, this.zoomString, this.childZoomStrings)).toEqual({
+      expect(self.hateoasHelperService.mapChildZoomElements(element, zoomString, childZoomStrings)).toEqual({
         code: {
           someKey: 'someValue'
         },
@@ -201,9 +202,9 @@ describe('HATEOAS helper service', function () {
     })
 
     it('should return undefined if the zoom isn\'t found', () => {
-      this.childZoomStrings = ['lineitems:element:code2', 'lineitems:element:rates2[]']
+      childZoomStrings = ['lineitems:element:code2', 'lineitems:element:rates2[]']
 
-      expect(self.hateoasHelperService.mapChildZoomElements(this.element, this.zoomString, this.childZoomStrings)).toEqual({
+      expect(self.hateoasHelperService.mapChildZoomElements(element, zoomString, childZoomStrings)).toEqual({
         _code: [
           {
             someKey: 'someValue'